Merge remote branch 'remotes/schendje/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 9 Jul 2011 14:19:04 +0000 (09:19 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 9 Jul 2011 14:19:04 +0000 (09:19 -0500)

Trivial merge