Merge remote branch 'spaetz/fix_description'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 9 May 2011 01:20:19 +0000 (20:20 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 9 May 2011 01:20:19 +0000 (20:20 -0500)

Trivial merge