merged from lp:~openerp-dev/openobject-addons/report_dev
authorapa-tiny <apa@tinyerp.com>
Fri, 8 Oct 2010 14:00:39 +0000 (19:30 +0530)
committerapa-tiny <apa@tinyerp.com>
Fri, 8 Oct 2010 14:00:39 +0000 (19:30 +0530)
bzr revid: apa@tinyerp.com-20101008140039-aml6kk843dd2ol3f


Trivial merge