Merge branch 'reduce-loading' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Jan 2011 14:34:29 +0000 (15:34 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Jan 2011 14:34:29 +0000 (15:34 +0100)

Trivial merge