[MERGE]: Merged with tpa's branch.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 7 Mar 2012 12:18:04 +0000 (17:48 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Wed, 7 Mar 2012 12:18:04 +0000 (17:48 +0530)
bzr revid: uco@tinyerp.com-20120307121804-l01yy3rz3oamcbwh


Trivial merge