revert
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 9 Dec 2008 20:38:36 +0000 (21:38 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 9 Dec 2008 20:38:36 +0000 (21:38 +0100)
bzr revid: fp@tinyerp.com-20081209203836-p5bo3iwzd6ff2y7u


Trivial merge