[MERGE]
authorChristophe Simonis <chs@tinyerp.com>
Mon, 22 Feb 2010 15:01:55 +0000 (16:01 +0100)
committerChristophe Simonis <chs@tinyerp.com>
Mon, 22 Feb 2010 15:01:55 +0000 (16:01 +0100)
bzr revid: chs@tinyerp.com-20100222150155-m4qksfvzgls4iphg


Trivial merge