ref: 933732c629f1241c19e56e3eadf7816785b325b7
parent: ef6da379d9e8ff261abb1e144b50bd2169ac4db7
parent: 9a3a6c1b53deaae0236aa8ee85d384f2d29032bb
author: Bryan Bishop <kanzure@gmail.com>
date: Mon Jan 23 15:32:30 EST 2012
merge YamaArashi/pokered hg-commit-id: 4a5294486028