merge
authorStephane Wirtel <stephane@tinyerp.com>
Wed, 24 Sep 2008 09:48:54 +0000 (11:48 +0200)
committerStephane Wirtel <stephane@tinyerp.com>
Wed, 24 Sep 2008 09:48:54 +0000 (11:48 +0200)
bzr revid: stephane@tinyerp.com-20080924094854-i8rdodi1vh9a24ph


Trivial merge