commit b14987b346e3548762c0a11a58e320775a54387c Merge: 9c0dd20 cd6ec7f Author: Mamoru Tasaka <tasaka1 at localhost.localdomain> Date: Mon Dec 31 14:06:19 2012 +0900 Merge remote-tracking branch 'origin/master' into f18 ---