[MERGE] with trunk
authorArnaud Pineux <api@openerp.com>
Mon, 26 Nov 2012 14:04:17 +0000 (15:04 +0100)
committerArnaud Pineux <api@openerp.com>
Mon, 26 Nov 2012 14:04:17 +0000 (15:04 +0100)
bzr revid: api@openerp.com-20121126140417-a7y4uj9r7y93hgg7


Trivial merge