[MERGE]: Merged with tpa's branch.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Thu, 1 Mar 2012 05:52:15 +0000 (11:22 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Thu, 1 Mar 2012 05:52:15 +0000 (11:22 +0530)
bzr revid: uco@tinyerp.com-20120301055215-nus4dwc5wx2fo770


Trivial merge