[MERGE]
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Wed, 25 Apr 2012 08:43:26 +0000 (14:13 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Wed, 25 Apr 2012 08:43:26 +0000 (14:13 +0530)
bzr revid: sgo@tinyerp.com-20120425084326-15h301oz4hayftdv


Trivial merge