[MERGE]
authorolt@tinyerp.com <>
Thu, 17 Sep 2009 13:22:28 +0000 (15:22 +0200)
committerolt@tinyerp.com <>
Thu, 17 Sep 2009 13:22:28 +0000 (15:22 +0200)
bzr revid: olt@tinyerp.com-20090917132228-k68goasscqwrubku


Trivial merge