[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Wed, 12 Sep 2012 10:07:46 +0000 (12:07 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Wed, 12 Sep 2012 10:07:46 +0000 (12:07 +0200)
commit87ec24bfe995e563993001f13d1053b340e492a0
treea05b9eb5c3f91f9e54da34b8df978e041f508399
parente14271fd36e0e71113650006981ae4b7ccb1b775
parentf1f23c52ea1601b7588a91497ba46e5b826719b7
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120912100746-1c2l3starj61b32y