[MERGE]Latest trunk
authordle@openerp.com <>
Thu, 29 Nov 2012 17:03:52 +0000 (18:03 +0100)
committerdle@openerp.com <>
Thu, 29 Nov 2012 17:03:52 +0000 (18:03 +0100)
bzr revid: dle@openerp.com-20121129170352-m8hpklzkuhbfxvev


Trivial merge