Merge branch 'master' of git@veekun.com:floof
authorEevee <git@veekun.com>
Sun, 25 Oct 2009 00:16:22 +0000 (17:16 -0700)
committerEevee <git@veekun.com>
Sun, 25 Oct 2009 00:16:22 +0000 (17:16 -0700)

Trivial merge