[MERGE]Latest trunkj
authordle@openerp.com <>
Mon, 17 Dec 2012 09:00:55 +0000 (10:00 +0100)
committerdle@openerp.com <>
Mon, 17 Dec 2012 09:00:55 +0000 (10:00 +0100)
bzr revid: dle@openerp.com-20121217090055-d5vh1qnjxemzuaqe


Trivial merge