[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Wed, 22 Aug 2012 18:11:27 +0000 (20:11 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Wed, 22 Aug 2012 18:11:27 +0000 (20:11 +0200)
commitae70fc72444ba4e40bb37e47e2232c679d788e7c
tree81cb70d8178961e0d2dbdcd2d4ec588ba78a668a
parent121b351b59c013beb421830a39af3ddffb0bdb5b
parent014ee6e5f8d13aded30765e7aec9a12a8c1b789b
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120822181127-mcs2n9b9l5ksonq0