merged w trunk
authorAntoine Huvelle <ahu@openerp.com>
Tue, 22 Nov 2011 12:06:13 +0000 (13:06 +0100)
committerAntoine Huvelle <ahu@openerp.com>
Tue, 22 Nov 2011 12:06:13 +0000 (13:06 +0100)
commitc529ae4d7e12ae1371f6ad3fef82de48d1bb204b
tree6353f3c2ebf2a6a9f3ad24d61e1ef9410fba76c0
parentf661ad310e0536522e80982ad1a206f3e28c34f5
parent11bc9e1ad8076f0293d08602ad23c921fcfe0248
merged w trunk

bzr revid: ahu@openerp.com-20111122120613-1w5srrpvgxifdobm