[MERGE] latest trunk
authorOlivier Dony <odo@openerp.com>
Fri, 16 Dec 2011 15:56:24 +0000 (16:56 +0100)
committerOlivier Dony <odo@openerp.com>
Fri, 16 Dec 2011 15:56:24 +0000 (16:56 +0100)
commit6add700d7aa9099872e9c4cd13c7cb05bd24c3a0
tree0550db9a4da943203be23fbddc86bb3305b94a23
parentba2b2bdae168ef5d5451798925bfcb5df1a08d7b
parent1afb14ddc43c524ab1ca94e6f97f370788a7c16d
[MERGE] latest trunk

bzr revid: odo@openerp.com-20111216155624-3nvdsaurjsdo44mx