[MERGE] merge from lp:~openerp/openobject-addons/trunk
authorHarry (Open ERP) <hmo@tinyerp.com>
Thu, 17 Dec 2009 13:40:57 +0000 (19:10 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Thu, 17 Dec 2009 13:40:57 +0000 (19:10 +0530)
bzr revid: hmo@tinyerp.com-20091217134057-40llgyk11ik0xt0g


Trivial merge