commit 61b5ec3f296c1641a1407883d34c4a4f8eafe12b Merge: 033ba04 592f2ca Author: Mamoru Tasaka <tasaka1 at localhost.localdomain> Date: Mon Dec 31 17:42:39 2012 +0900 Merge remote-tracking branch 'origin/f17' ---