merge from trunk
authorMinh Tran <mit@openerp.com>
Thu, 30 Aug 2012 11:27:13 +0000 (13:27 +0200)
committerMinh Tran <mit@openerp.com>
Thu, 30 Aug 2012 11:27:13 +0000 (13:27 +0200)
bzr revid: mit@openerp.com-20120830112713-9wh0qe2wevd3ljmu


Trivial merge