merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 2 Apr 2009 15:43:45 +0000 (17:43 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 2 Apr 2009 15:43:45 +0000 (17:43 +0200)
bzr revid: fp@tinyerp.com-20090402154345-bmi8pai63atarxci


Trivial merge