new updated branch
authorAmit Parmar (OpenERP) <aar@tinyerp.com>
Fri, 26 Aug 2011 11:59:39 +0000 (17:29 +0530)
committerAmit Parmar (OpenERP) <aar@tinyerp.com>
Fri, 26 Aug 2011 11:59:39 +0000 (17:29 +0530)
bzr revid: aar@tinyerp.com-20110826115939-g26v4qfo6atothq0


Trivial merge