merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 9 Mar 2009 12:50:44 +0000 (13:50 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 9 Mar 2009 12:50:44 +0000 (13:50 +0100)
bzr revid: fp@tinyerp.com-20090309125044-b2rj7ulmv2yxrsvt


Trivial merge