[MERGE]:lp:~openerp-dev/openobject-addons/trunk-event-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 10:05:59 +0000 (15:35 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 10:05:59 +0000 (15:35 +0530)
bzr revid: apa@tinyerp.com-20120426100559-oomxj9szeftf1xsc


Trivial merge