Merge branch 'reduce-loading' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Jan 2011 18:15:26 +0000 (19:15 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Jan 2011 19:51:55 +0000 (20:51 +0100)

Trivial merge