[MERGE]Merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Tue, 19 Mar 2013 05:22:41 +0000 (10:52 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Tue, 19 Mar 2013 05:22:41 +0000 (10:52 +0530)
bzr revid: dhr@tinyerp.com-20130319052241-gu7gsbshevh1qdwy


Trivial merge