Merge branch 'release-0.6.2' 0.6.2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 17 Apr 2011 11:47:39 +0000 (13:47 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 17 Apr 2011 11:47:39 +0000 (13:47 +0200)

Trivial merge