[MERGE]
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 4 May 2011 08:47:48 +0000 (14:17 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 4 May 2011 08:47:48 +0000 (14:17 +0530)
bzr revid: uco@tinyerp.com-20110504084748-692j5e5p2wkfsl9d


Trivial merge