[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)
commitf295939edcfa9b663c9da620c46aff72e899018f
treef903d557764181092841fdc903dfeee0e0c85cce
parent100f3199e7120948dcc24aed555e8323ba0871aa
parenta3b3fbb575c39de8a0d96b8437468924d59ed4bd
[MERGE] with trunk

bzr revid: api@openerp.com-20121126140417-a7y4uj9r7y93hgg7