Updated for OpenOCD 0.6.1