[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 29 Oct 2012 05:34:40 +0000 (11:04 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 29 Oct 2012 05:34:40 +0000 (11:04 +0530)
bzr revid: cha@tinyerp.com-20121029053440-e0xabu6cczx0o5dt


Trivial merge