Merge branch 'master' of ssh://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Fri, 15 Feb 2013 16:38:32 +0000 (11:38 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 15 Feb 2013 16:38:32 +0000 (11:38 -0500)

Trivial merge