[Merge]
authorAMP (OpenERP) <amp@tinyerp.com>
Sat, 16 Oct 2010 05:17:46 +0000 (10:47 +0530)
committerAMP (OpenERP) <amp@tinyerp.com>
Sat, 16 Oct 2010 05:17:46 +0000 (10:47 +0530)
bzr revid: amp@tinyerp.com-20101016051746-yys8jymkqor51y72


Trivial merge