Merge remote-tracking branch 'remotes/bretts/bug261-resized-filenames'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Mar 2012 19:33:12 +0000 (14:33 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Mar 2012 19:33:12 +0000 (14:33 -0500)

Trivial merge