[Merge]with : lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Tue, 3 Jul 2012 05:28:09 +0000 (10:58 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Tue, 3 Jul 2012 05:28:09 +0000 (10:58 +0530)
bzr revid: dbr@tinyerp.com-20120703052809-96bmsrbquiql8xvb


Trivial merge