[MERGE]merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Fri, 1 Feb 2013 06:55:01 +0000 (12:25 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Fri, 1 Feb 2013 06:55:01 +0000 (12:25 +0530)
bzr revid: dhr@tinyerp.com-20130201054352-se7iuxpmgmd2s1zf
bzr revid: dhr@tinyerp.com-20130201065501-4g76556uhorpvv4o


Trivial merge