Merge remote branch 'remotes/schendje/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 20 Aug 2011 21:49:57 +0000 (16:49 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 20 Aug 2011 21:49:57 +0000 (16:49 -0500)

Trivial merge