Merge from trunk
authorMinh Tran <mit@openerp.com>
Wed, 11 Jan 2012 11:08:03 +0000 (12:08 +0100)
committerMinh Tran <mit@openerp.com>
Wed, 11 Jan 2012 11:08:03 +0000 (12:08 +0100)
bzr revid: mit@openerp.com-20120111110803-pcizwc2x9w51tsdx


Trivial merge