[MERGE]: Merge with lp:openobject-server
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 16 Oct 2012 05:44:51 +0000 (11:14 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 16 Oct 2012 05:44:51 +0000 (11:14 +0530)
bzr revid: mma@tinyerp.com-20121016054451-ciq04vauebotgoe5


Trivial merge