Merge branch 'master' of git://veekun.com/pokedex
authorZhorken <zhorken@gmail.com>
Sun, 31 Jan 2010 19:10:14 +0000 (14:10 -0500)
committerZhorken <zhorken@gmail.com>
Sun, 31 Jan 2010 19:10:14 +0000 (14:10 -0500)

Trivial merge