merged from lp:~openerp-report/openobject-addons/report-dev
authorapa-tiny <apa@tinyerp.com>
Wed, 3 Nov 2010 04:50:17 +0000 (10:20 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 3 Nov 2010 04:50:17 +0000 (10:20 +0530)
bzr revid: apa@tinyerp.com-20101103045017-u0rprvrrp5bf4vi3


Trivial merge