merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 21 Jan 2009 13:05:18 +0000 (14:05 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 21 Jan 2009 13:05:18 +0000 (14:05 +0100)
bzr revid: fp@tinyerp.com-20090121130518-7sx5szls9f2rzvd7


Trivial merge