Merge branch 'image-management' into beta-freefall beta-freefall-0.6.2-2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 13 Apr 2011 13:48:47 +0000 (15:48 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 13 Apr 2011 13:48:47 +0000 (15:48 +0200)

Trivial merge