Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorssi <ssi@tinyerp.com>
Wed, 3 Nov 2010 06:08:28 +0000 (11:38 +0530)
committerssi <ssi@tinyerp.com>
Wed, 3 Nov 2010 06:08:28 +0000 (11:38 +0530)
bzr revid: ssi@tinyerp.com-20101103060828-g9f48t9eck3k23ek


Trivial merge