[MERGE]: Merged with trunk-addons.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Mon, 21 Nov 2011 05:10:23 +0000 (10:40 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Mon, 21 Nov 2011 05:10:23 +0000 (10:40 +0530)
bzr revid: uco@tinyerp.com-20111121051023-cw7nzitr9ph1wh4h


Trivial merge