[MERGE] Merged trunk.
authorJiten (OpenERP) <jra@tinyerp.com>
Fri, 2 Nov 2012 11:29:02 +0000 (16:59 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Fri, 2 Nov 2012 11:29:02 +0000 (16:59 +0530)
commit339560baedc0be99e0e2824aa8b3de98e08ba19d
tree483727f8afde92cb2d6a4a951d542296a879b206
parentc3fdd52f3c3a4b701155151dcc7f999873afc770
parentd658b2a6e564a799d063ac0df561381f55838214
[MERGE] Merged trunk.

bzr revid: jra@tinyerp.com-20121102112902-lxog1903hwrsibw5