[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Fri, 2 Dec 2011 16:05:46 +0000 (17:05 +0100)
committerVo Minh Thu <vmt@openerp.com>
Fri, 2 Dec 2011 16:05:46 +0000 (17:05 +0100)
commitb0961a0ddedfe21154738a4169c230abae263a54
tree92be504e6f3fe1698dcd98a4adbc8505c099fe87
parent2d67a753383b03a8f5f81d2fbbfd744b24d32d83
parent86bfd7a4eebf371f905d1c2502848a69c7d86276
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20111202160546-t5csnsd6daclcqxs