Merge remote-tracking branch 'origin/master'
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 9 Apr 2011 20:09:54 +0000 (22:09 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 9 Apr 2011 20:09:54 +0000 (22:09 +0200)

Trivial merge