Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 25 Jan 2011 08:40:08 +0000 (09:40 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 25 Jan 2011 08:40:08 +0000 (09:40 +0100)

Trivial merge