[MERGE] trunk.
authorVaibhav (OpenERP) <vda@tinyerp.com>
Wed, 23 Nov 2011 10:29:17 +0000 (15:59 +0530)
committerVaibhav (OpenERP) <vda@tinyerp.com>
Wed, 23 Nov 2011 10:29:17 +0000 (15:59 +0530)
commitcc36c7c401da4e38837ba63052ef72120ae072ca
treec09697c6cced928732da6f3a5c52a57c27b8a791
parent15b357cb79a7243a74515bd7596c385e9b8e0c6a
parent8501aecd3bda0075295e9b4db2febd404cd39ca3
[MERGE] trunk.

bzr revid: vda@tinyerp.com-20111123102917-w5tbmo4fox75t6mz