[MERGE]Merged with 7.0
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 24 Apr 2013 04:52:45 +0000 (10:22 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 24 Apr 2013 04:52:45 +0000 (10:22 +0530)
bzr revid: dhr@tinyerp.com-20130424045245-ei1zkkddlwxgxzp6


Trivial merge