merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 7 Aug 2009 13:55:21 +0000 (15:55 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 7 Aug 2009 13:55:21 +0000 (15:55 +0200)
bzr revid: fp@tinyerp.com-20090807135521-xtjmrye29jvsbpae


Trivial merge