Merge branch 'master' of git@gitorious.org:git-python/apollo13