Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 4 Oct 2011 04:19:23 +0000 (06:19 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 4 Oct 2011 04:19:23 +0000 (06:19 +0200)

Trivial merge