[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 04:50:59 +0000 (10:20 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 04:50:59 +0000 (10:20 +0530)
bzr revid: apa@tinyerp.com-20120430045059-mocm5snng8i78ag2


Trivial merge