[MERGE] lp:~openerp-dev/openobject-addons/trunk-search_views-events-dbr
authorDBR (OpenERP) <dbr@tinyerp.com>
Fri, 23 Sep 2011 13:51:46 +0000 (19:21 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Fri, 23 Sep 2011 13:51:46 +0000 (19:21 +0530)
bzr revid: dbr@tinyerp.com-20110923135146-dhr8hzn78sc209d9


Trivial merge