after merge
authorAntoine Huvelle <ahu@openerp.com>
Tue, 27 Dec 2011 13:06:53 +0000 (14:06 +0100)
committerAntoine Huvelle <ahu@openerp.com>
Tue, 27 Dec 2011 13:06:53 +0000 (14:06 +0100)
commiteaf85461354b642fe799d33c9d35cf7b6e06594a
tree6f7769e98b1ecfb9b48aa899d98c7f25194fe1db
parent55d6a5623b2979e78811589e55fc8653eba227e1
parentbc4f3aac14f5966b77fa5625c223f7d21dc60542
after merge

bzr revid: ahu@openerp.com-20111227130653-xps2bp2nycp6s650