Merge branch 'master' of eevee@tekkanin.veekun.com:dev/pokedex
authorEevee <git@veekun.com>
Mon, 23 Mar 2009 01:14:44 +0000 (21:14 -0400)
committerEevee <git@veekun.com>
Mon, 23 Mar 2009 01:14:44 +0000 (21:14 -0400)

Trivial merge