merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 7 Aug 2009 08:15:07 +0000 (10:15 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 7 Aug 2009 08:15:07 +0000 (10:15 +0200)
bzr revid: fp@tinyerp.com-20090807081507-3gli9g4cxualvepf


Trivial merge