Merge branch 'master' of git@gitorious.org:git-python/apollo13
authorFlorian Apolloner <florian@apolloner.eu>
Fri, 20 Jun 2008 21:39:57 +0000 (23:39 +0200)
committerFlorian Apolloner <florian@apolloner.eu>
Fri, 20 Jun 2008 21:39:57 +0000 (23:39 +0200)

Trivial merge