[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-outlook-thunderbird-view...
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Fri, 29 Jun 2012 13:26:19 +0000 (18:56 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Fri, 29 Jun 2012 13:26:19 +0000 (18:56 +0530)
bzr revid: atp@tinyerp.com-20120629132619-s3glki2umhnghxxo


Trivial merge