[MERGE]Latest trunk
authordle@openerp.com <>
Fri, 21 Dec 2012 16:10:41 +0000 (17:10 +0100)
committerdle@openerp.com <>
Fri, 21 Dec 2012 16:10:41 +0000 (17:10 +0100)
bzr revid: dle@openerp.com-20121221161041-f1zwxczuok555qnc


Trivial merge