[MERGE]: Merge with lp:openobject-addons-trunk
authorksa (Open ERP) <ksa@tinyerp.co.in>
Fri, 20 Aug 2010 05:01:19 +0000 (10:31 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Fri, 20 Aug 2010 05:01:19 +0000 (10:31 +0530)
bzr revid: ksa@tinyerp.co.in-20100820050119-kj6gupa1u9ay7jj3


Trivial merge