[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Wed, 4 Jan 2012 12:57:30 +0000 (13:57 +0100)
committerRaphael Collet <rco@openerp.com>
Wed, 4 Jan 2012 12:57:30 +0000 (13:57 +0100)
bzr revid: rco@openerp.com-20120104125730-j2j7jhiwhmthssi8


Trivial merge