Merge branch 'new-priorities' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 19:34:55 +0000 (20:34 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 19:34:55 +0000 (20:34 +0100)

Trivial merge