[MERGE] lp:~openerp-dev/openobject-addons/uco-dev-addons1
authorSbh (OpenERP) <sbh@tinyerp.com>
Thu, 30 Dec 2010 12:53:46 +0000 (18:23 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Thu, 30 Dec 2010 12:53:46 +0000 (18:23 +0530)
bzr revid: sbh@tinyerp.com-20101230125346-m0a28ukof7468gxv


Trivial merge