commit 1f50e0569d7ecc7afa5e043e257ff6820dfd3894 Merge: 26d6ed4 a15f2f5 Author: Mamoru Tasaka <tasaka1 at localhost.localdomain> Date: Wed Jan 2 15:25:09 2013 +0900 Fix merge conflict ---