[Merge] Merge with main addons.
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 23 Jul 2012 09:22:12 +0000 (14:52 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 23 Jul 2012 09:22:12 +0000 (14:52 +0530)
bzr revid: cha@tinyerp.com-20120723092212-bl60phigf74njadu


Trivial merge