commit 3ccf95d5e35ee57cc37a529bb2c4a0336bbad47e Merge: 33340e5 dbbec23 Author: Mamoru Tasaka <tasaka1 at localhost.localdomain> Date: Thu Jan 3 17:09:45 2013 +0900 Merge remote-tracking branch 'origin/f17' ---