Merge branch 'release-0.7.2' 0.7.2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 4 Oct 2011 04:13:58 +0000 (06:13 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 4 Oct 2011 04:13:58 +0000 (06:13 +0200)

Trivial merge