[Merge] lp:~openerp-dev/openobject-addons/trunk-import_google-backlog2_import_meeting-jam
authorBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 8 Jun 2011 11:11:10 +0000 (16:41 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 8 Jun 2011 11:11:10 +0000 (16:41 +0530)
bzr revid: sbh@tinyerp.com-20110608111110-69kazvbrpstov1bj


Trivial merge