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

Trivial merge