[MERGE] Merge from trunk
authorMinh Tran <mit@openerp.com>
Wed, 21 Dec 2011 16:13:33 +0000 (17:13 +0100)
committerMinh Tran <mit@openerp.com>
Wed, 21 Dec 2011 16:13:33 +0000 (17:13 +0100)
bzr revid: mit@openerp.com-20111221161333-dnd48zog118cvebw


Trivial merge