[MERGE]Merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 27 Feb 2013 09:27:46 +0000 (14:57 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 27 Feb 2013 09:27:46 +0000 (14:57 +0530)
bzr revid: dhr@tinyerp.com-20130227092746-3tpmuy0v3o32wt6y


Trivial merge