commit 3123fbb8bfda614828a2392536455841883b167e Merge: 1f47165 ae087fa Author: TASAKA Mamoru <mtasaka at localhost.localdomain> Date: Thu Dec 6 17:53:52 2012 +0900 Merge remote-tracking branch 'origin/master' into f17 ---