[MERGE]:merged from lp:openobject-addons
authorapa-tiny <apa@tinyerp.com>
Mon, 11 Oct 2010 12:57:40 +0000 (18:27 +0530)
committerapa-tiny <apa@tinyerp.com>
Mon, 11 Oct 2010 12:57:40 +0000 (18:27 +0530)
bzr revid: apa@tinyerp.com-20101011125740-s97spnlpjdz0yelz


Trivial merge