[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)
bzr revid: vme@tinyerp.com-20121207131444-qscwkjtqua3nqt9q
bzr revid: vme@tinyerp.com-20121210052056-p0cnnaam9j8l4usv


Trivial merge