Merge branch 'release-0.0.7' 0.0.7
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 17 Sep 2011 12:55:41 +0000 (14:55 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 17 Sep 2011 12:55:41 +0000 (14:55 +0200)

Trivial merge