merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 7 Jan 2009 14:09:00 +0000 (15:09 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 7 Jan 2009 14:09:00 +0000 (15:09 +0100)
bzr revid: fp@tinyerp.com-20090107140900-qv63cftjstdkdeoz


Trivial merge