Merge branch 'master' of git@veekun.com:pokedex into HEAD
authorEevee <git@veekun.com>
Mon, 27 Jul 2009 07:09:18 +0000 (00:09 -0700)
committerEevee <git@veekun.com>
Mon, 27 Jul 2009 07:09:18 +0000 (00:09 -0700)

Trivial merge