[MERGE]Latest trunk
authordle@openerp.com <>
Mon, 17 Dec 2012 13:33:43 +0000 (14:33 +0100)
committerdle@openerp.com <>
Mon, 17 Dec 2012 13:33:43 +0000 (14:33 +0100)
bzr revid: dle@openerp.com-20121217133343-ki5ib7fszlmpu2i3


Trivial merge