[MERGE]Latest trunk
authordle@openerp.com <>
Thu, 20 Dec 2012 18:45:53 +0000 (19:45 +0100)
committerdle@openerp.com <>
Thu, 20 Dec 2012 18:45:53 +0000 (19:45 +0100)
bzr revid: dle@openerp.com-20121220184553-rtm9y36uziy2gqld


Trivial merge