commit 542332262fd69f716c911496187aa060341339db Merge: b159bff 94331d7 Author: TASAKA Mamoru <mtasaka at localhost.localdomain> Date: Tue Jan 15 18:03:57 2013 +0900 Merge remote-tracking branch 'origin/f17' ---