[MERGE]Latest trunk
authordle@openerp.com <>
Fri, 14 Dec 2012 15:11:38 +0000 (16:11 +0100)
committerdle@openerp.com <>
Fri, 14 Dec 2012 15:11:38 +0000 (16:11 +0100)
bzr revid: dle@openerp.com-20121214151138-4nsawprqbka0dc5y


Trivial merge