commit 19dc5971f94463eee4d81bba806a1e1f736f7391 Merge: b5d610d eee210c Author: Mamoru Tasaka <tasaka1 at localhost.localdomain> Date: Mon Dec 31 16:13:02 2012 +0900 Merge remote-tracking branch 'origin/f17' ---