Merge branch 'master' of ssh://dbrownell@openocd.git.sourceforge.net/gitroot/openocd...