[MERGE] merge
authornel@tinyerp.com <>
Mon, 29 Mar 2010 09:03:09 +0000 (11:03 +0200)
committernel@tinyerp.com <>
Mon, 29 Mar 2010 09:03:09 +0000 (11:03 +0200)
bzr revid: nel@tinyerp.com-20100329090309-vholpuokg2y5uh0g


Trivial merge