Merge branch 'master' of ssh://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 18 Nov 2012 14:11:38 +0000 (09:11 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 18 Nov 2012 14:11:38 +0000 (09:11 -0500)

Trivial merge