[MERGE]TRUNK.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 10 Dec 2012 05:20:56 +0000 (10:50 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 10 Dec 2012 05:20:56 +0000 (10:50 +0530)
commitb7b3a16dca204865156db4d8a04779e72388d933
treec014b8dfcae0b26b8f6a22854fe8cd0e706a1bf8
parentaec7ff50247918d3903f3c272bf99cf7d84a2f5e
parent7f1d5daf2f7a137a470a4a72779408edf7995910
[MERGE]TRUNK.

bzr revid: vme@tinyerp.com-20121207131444-qscwkjtqua3nqt9q
bzr revid: vme@tinyerp.com-20121210052056-p0cnnaam9j8l4usv