[MERGE]:merged from lp:~openerp-report/openobject-addons/report-dev
authorapa-tiny <apa@tinyerp.com>
Mon, 1 Nov 2010 08:03:20 +0000 (13:33 +0530)
committerapa-tiny <apa@tinyerp.com>
Mon, 1 Nov 2010 08:03:20 +0000 (13:33 +0530)
bzr revid: apa@tinyerp.com-20101101080320-ioo6mpf82pdvthe1


Trivial merge