[MERGE]
authorHDA (OpenERP) <hda@tinyerp.com>
Thu, 1 Oct 2009 13:42:05 +0000 (19:12 +0530)
committerHDA (OpenERP) <hda@tinyerp.com>
Thu, 1 Oct 2009 13:42:05 +0000 (19:12 +0530)
bzr revid: hda@tinyerp.com-20091001134205-o0ux35wcyahwz4cp


Trivial merge