merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 21 Oct 2008 16:30:15 +0000 (18:30 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 21 Oct 2008 16:30:15 +0000 (18:30 +0200)
bzr revid: fp@tinyerp.com-20081021163015-ik6v6rzyytb2czrz


Trivial merge