[Merge]merge mistakes
authordle@openerp.com <>
Thu, 29 Nov 2012 14:36:07 +0000 (15:36 +0100)
committerdle@openerp.com <>
Thu, 29 Nov 2012 14:36:07 +0000 (15:36 +0100)
bzr revid: dle@openerp.com-20121129143607-lwzsfxv3rsu2eojc


Trivial merge