[MERGE]: Merged with tpa's branch.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 7 Mar 2012 12:18:04 +0000 (17:48 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 7 Mar 2012 12:18:04 +0000 (17:48 +0530)
commitd1f3dae261fd579b087cc1d47794cbb3dedd639d
tree06fa57c251cf96472268654ed25bc7392d871596
parentde835f766da81b7d5c3d576b548d31cb15f3524f
parent87a70fbc2b237410d2db5fd28b893aa23fea64dd
[MERGE]: Merged with tpa's branch.

bzr revid: uco@tinyerp.com-20120307121804-l01yy3rz3oamcbwh