merged
authorHDA (OpenERP) <hda@tinyerp.com>
Mon, 29 Mar 2010 06:11:18 +0000 (11:41 +0530)
committerHDA (OpenERP) <hda@tinyerp.com>
Mon, 29 Mar 2010 06:11:18 +0000 (11:41 +0530)
bzr revid: hda@tinyerp.com-20100329061118-7bgomiohtjgwnhza


Trivial merge