[MERGE]:merged from lp:openobject-addons
authorapa-tiny <apa@tinyerp.com>
Tue, 12 Oct 2010 05:50:02 +0000 (11:20 +0530)
committerapa-tiny <apa@tinyerp.com>
Tue, 12 Oct 2010 05:50:02 +0000 (11:20 +0530)
bzr revid: apa@tinyerp.com-20101012055002-bpczo0a32nzm9m8v


Trivial merge