merge
authorFabien Pinckaers <fp@tinyerp.com>
Sun, 7 Dec 2008 02:16:21 +0000 (03:16 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Sun, 7 Dec 2008 02:16:21 +0000 (03:16 +0100)
bzr revid: fp@tinyerp.com-20081207021621-eqy32r8zg19qsjsi


Trivial merge