Merged
authorHDA (OpenERP) <hda@tinyerp.com>
Wed, 28 Oct 2009 11:58:52 +0000 (17:28 +0530)
committerHDA (OpenERP) <hda@tinyerp.com>
Wed, 28 Oct 2009 11:58:52 +0000 (17:28 +0530)
bzr revid: hda@tinyerp.com-20091028115852-fut2ilpojdjmm70x


Trivial merge