commit 7f0d2b35e5a7f71768420b0b80f3acf6e46722ac Merge: a80dcb3 eb57cf7 Author: Mamoru Tasaka <tasaka1 at localhost.localdomain> Date: Mon Dec 31 15:33:38 2012 +0900 Merge remote-tracking branch 'origin/master' into f18 ---