Merge remote branch 'refs/remotes/spaetz/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 8 May 2011 12:11:57 +0000 (07:11 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 8 May 2011 12:11:57 +0000 (07:11 -0500)

Trivial merge