[MERGE]Merged with 7.0
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 29 May 2013 10:57:24 +0000 (16:27 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 29 May 2013 10:57:24 +0000 (16:27 +0530)
bzr revid: dhr@tinyerp.com-20130529105724-edgntayd2d9fnhka


Trivial merge