merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 4 Mar 2009 15:49:24 +0000 (16:49 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 4 Mar 2009 15:49:24 +0000 (16:49 +0100)
bzr revid: fp@tinyerp.com-20090304154924-p4xlq6nsefe3kfm6


Trivial merge