merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 15 Sep 2009 07:43:52 +0000 (09:43 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 15 Sep 2009 07:43:52 +0000 (09:43 +0200)
bzr revid: fp@tinyerp.com-20090915074352-fium6gdfmk0jqckt


Trivial merge