merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 18 Oct 2008 06:38:06 +0000 (08:38 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 18 Oct 2008 06:38:06 +0000 (08:38 +0200)
bzr revid: fp@tinyerp.com-20081018063806-dfrtspvoyr7wg11k


Trivial merge