[Merge]: Merge from lp:openobject-server.
authorrch-openerp <rch@tinyerp.com>
Mon, 22 Nov 2010 04:52:27 +0000 (10:22 +0530)
committerrch-openerp <rch@tinyerp.com>
Mon, 22 Nov 2010 04:52:27 +0000 (10:22 +0530)
bzr revid: rch@tinyerp.com-20101122045227-wofnz8tspt8diu6p


Trivial merge