[Merge]
authorHDA (OpenERP) <hda@tinyerp.com>
Tue, 25 Aug 2009 08:37:47 +0000 (14:07 +0530)
committerHDA (OpenERP) <hda@tinyerp.com>
Tue, 25 Aug 2009 08:37:47 +0000 (14:07 +0530)
bzr revid: hda@tinyerp.com-20090825083747-rl3sm4ech6wfw6fp


Trivial merge