[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Mon, 22 Dec 2008 08:06:36 +0000 (09:06 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Mon, 22 Dec 2008 08:06:36 +0000 (09:06 +0100)
bzr revid: stephane@tinyerp.com-20081222080636-0it48r8lklkwu1oy


Trivial merge