[Merge]Merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Mon, 18 Mar 2013 11:51:47 +0000 (17:21 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Mon, 18 Mar 2013 11:51:47 +0000 (17:21 +0530)
bzr revid: dhr@tinyerp.com-20130318115147-iif7gjyoz7nqrbp8


Trivial merge