ref: 7d7f6753eac4a3bcd422c570756a981482ab9ae1
parent: 5ed66553b6053331ee82f946eba80c70503247c0
parent: b4ad9d97b6604056c51238cf4ced45411962c86d
author: Bryan Bishop <kanzure@gmail.com>
date: Wed Jan 18 07:07:32 EST 2012
Merge KuroiIeWa5Da/pokered. hg-commit-id: 8246be52661a