Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 8 May 2011 20:13:47 +0000 (22:13 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 8 May 2011 20:13:47 +0000 (22:13 +0200)

Trivial merge