[MERGE ] Merge lp:~openerp-dev/openobject-addons/trunk-contact-google-sync
authorBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 1 Jun 2011 09:32:27 +0000 (15:02 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 1 Jun 2011 09:32:27 +0000 (15:02 +0530)
bzr revid: sbh@tinyerp.com-20110601093227-8eex1ulr086pmctm


Trivial merge