ref: bca678ad2d7998205381c840abfcdaf51b20d3ec
parent: 08445fe0ade2998cb6607a7ee2b1105e41a4fdb6
parent: d908d8a74d1ed1b5fd401cac7df3bfac6cedca5a
author: Bryan Bishop <kanzure@gmail.com>
date: Wed Jan 25 07:23:45 EST 2012
Merge YamaArashi/pokered hg-commit-id: d6ff59ab91c5