[MERGE]
authorolt@tinyerp.com <>
Wed, 26 May 2010 14:52:50 +0000 (16:52 +0200)
committerolt@tinyerp.com <>
Wed, 26 May 2010 14:52:50 +0000 (16:52 +0200)
bzr revid: olt@tinyerp.com-20100526145250-frj95thfti9wtxmf


Trivial merge