merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 18 Dec 2008 18:01:53 +0000 (19:01 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 18 Dec 2008 18:01:53 +0000 (19:01 +0100)
bzr revid: fp@tinyerp.com-20081218180153-eljdrsoijlmwsgp7


Trivial merge