commit b6a6962d5a2e2732d41971252e7a00e6d4637a55 Merge: 7fdee27 33e58b4 Author: Mamoru Tasaka <tasaka1 at localhost.localdomain> Date: Mon Dec 31 15:17:54 2012 +0900 Merge remote-tracking branch 'origin/master' into f18 ---