[MERGE]: Merged with trunk addons.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Fri, 9 Mar 2012 10:39:29 +0000 (16:09 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Fri, 9 Mar 2012 10:39:29 +0000 (16:09 +0530)
bzr revid: uco@tinyerp.com-20120309103929-sm3d8wh2vmde9rhb


Trivial merge