[MERGE]merged with 7.0
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Thu, 23 May 2013 07:18:53 +0000 (12:48 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Thu, 23 May 2013 07:18:53 +0000 (12:48 +0530)
bzr revid: dhr@tinyerp.com-20130523071853-m9yqt1pfs9kxd5sb


Trivial merge