Merge branch 'release-0.7.1' 0.7.1
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 27 Sep 2011 04:41:58 +0000 (06:41 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 27 Sep 2011 04:41:58 +0000 (06:41 +0200)

Trivial merge