Merge branch 'release-0.7' 0.7
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 Sep 2011 20:17:49 +0000 (22:17 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 Sep 2011 20:17:49 +0000 (22:17 +0200)

Trivial merge