Merge from trunk
authorMinh Tran <mit@openerp.com>
Wed, 11 Jan 2012 12:24:21 +0000 (13:24 +0100)
committerMinh Tran <mit@openerp.com>
Wed, 11 Jan 2012 12:24:21 +0000 (13:24 +0100)
bzr revid: mit@openerp.com-20120111122421-5mywxemtnp0e7an8


Trivial merge