From: tmk <nobody@nowhere>
Date: Sun, 10 Feb 2013 14:01:20 +0000 (+0900)
Subject: Merge branch 'gh60'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4701b08b71b187cb3d015bec7e05d30e35c344ac;p=tmk_firmware.git

Merge branch 'gh60'
---

4701b08b71b187cb3d015bec7e05d30e35c344ac