[MERGE] Latest trunk
authorvta vta@openerp.com <>
Wed, 2 Jan 2013 10:24:15 +0000 (11:24 +0100)
committervta vta@openerp.com <>
Wed, 2 Jan 2013 10:24:15 +0000 (11:24 +0100)
commitd88ef3f0743cf647ad5d17aea97e1c92f7de418c
tree8190161a2ed14b24f0c8b670adb44e31f2685d17
parent8a27d3d138dfea25b09d891bcbad4fccdd2c718a
parent8a90401507c7e02deb5fd8c7627c66a2f331c546
[MERGE] Latest trunk

bzr revid: vta@openerp.com-20130102102415-y104nqzm5dz1is3n