[MERGE]
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Mon, 31 Jan 2011 04:55:03 +0000 (10:25 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Mon, 31 Jan 2011 04:55:03 +0000 (10:25 +0530)
bzr revid: uco@tinyerp.com-20110131045503-41pyybdlk6ytl6sq


Trivial merge