Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 21 Nov 2011 18:11:15 +0000 (19:11 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 21 Nov 2011 18:11:15 +0000 (19:11 +0100)

Trivial merge