Merge branch 'master' of ssh://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 15 Jan 2012 18:27:20 +0000 (13:27 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 15 Jan 2012 18:27:20 +0000 (13:27 -0500)

Trivial merge