Merge remote branch 'remotes/gullydwarf-cfdv/b372_rmdbfield_thumbnail_file'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 12 Aug 2011 02:31:48 +0000 (21:31 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 12 Aug 2011 02:31:48 +0000 (21:31 -0500)

Trivial merge