[MERGE]
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Mon, 16 Apr 2012 05:13:34 +0000 (10:43 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Mon, 16 Apr 2012 05:13:34 +0000 (10:43 +0530)
bzr revid: sgo@tinyerp.com-20120412052741-389o5xnv8ypll52r
bzr revid: sgo@tinyerp.com-20120412104807-92bg6w3xp6xyzilv
bzr revid: sgo@tinyerp.com-20120416051334-6dpee972ngw09s3n


Trivial merge