[MERGE]: Merge with lp:openobject-addons-trunk
authorksa (Open ERP) <ksa@tinyerp.co.in>
Thu, 14 Oct 2010 04:37:55 +0000 (10:07 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Thu, 14 Oct 2010 04:37:55 +0000 (10:07 +0530)
bzr revid: ksa@tinyerp.co.in-20101014043755-zgmel99bqajugxqc


Trivial merge