commit f40beb2967613a44d285f516540b00893c24d235 Merge: dc1e69f a7ad999 Author: Mamoru Tasaka <tasaka1 at localhost.localdomain> Date: Sun Nov 4 02:20:32 2012 +0900 Merge remote-tracking branch 'origin/master' into f17 ---