[MERGE]
authornel@tinyerp.com <>
Mon, 29 Mar 2010 09:51:38 +0000 (11:51 +0200)
committernel@tinyerp.com <>
Mon, 29 Mar 2010 09:51:38 +0000 (11:51 +0200)
bzr revid: nel@tinyerp.com-20100329095138-wzwgli2t51rchom5


Trivial merge