[MERGE] trunk
authorAntonin Bourguignon <abo@openerp.com>
Tue, 4 Dec 2012 10:35:06 +0000 (11:35 +0100)
committerAntonin Bourguignon <abo@openerp.com>
Tue, 4 Dec 2012 10:35:06 +0000 (11:35 +0100)
commit7d27a761d9d875c12fd909b0a8e3bee5cbebf877
treedc73b90412104613e49bf017cb84be5460b0e7ab
parent4f1e657da79cc60fc6ba8c890d6f1869f4ea2ef1
parentbf2a3109eea5434be47760da43ccda36380bca62
[MERGE] trunk

bzr revid: abo@openerp.com-20121204103506-07ublj0x0r8r73rc