[MERGE] Merge lp:~openerp-dev/openobject-addons/uco-dev-addons1
authorsbh (Open ERP) <sbh@tinyerp.com>
Wed, 10 Nov 2010 10:27:29 +0000 (15:57 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Wed, 10 Nov 2010 10:27:29 +0000 (15:57 +0530)
bzr revid: sbh@tinyerp.com-20101110102729-vjoxe0tuap2pww35


Trivial merge