Merge branch 'release-0.7.3' 0.7.3
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 16 Nov 2011 19:20:39 +0000 (20:20 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 16 Nov 2011 19:20:39 +0000 (20:20 +0100)

Trivial merge