Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 26 Jan 2011 10:00:31 +0000 (11:00 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 26 Jan 2011 10:00:31 +0000 (11:00 +0100)

Trivial merge