[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Tue, 23 Oct 2012 12:03:26 +0000 (17:33 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Tue, 23 Oct 2012 12:03:26 +0000 (17:33 +0530)
bzr revid: cha@tinyerp.com-20121023120326-1x61o0a5dtbg313q


Trivial merge