OpenOCD error with ST-Link V2

When trying to use OpenOCD with a STM32F4Discovery using STLink V2 I get the following error.

Open On-Chip Debugger 0.8.0 (2014-04-28-08:39)
Licensed under GNU GPL v2
For bug reports, read
	http://openocd.sourceforge.net/doc/doxygen/bugs.html
Warn : Interface already configured, ignoring
Error: already specified hl_layout stlink
srst_only separate srst_nogate srst_open_drain connect_deassert_srst
Info : This adapter doesn't support configurable speed
Error: open failed
in procedure 'transport'
in procedure 'ini

I have removed the STLink WinUSB drivers and upgraded them using the http://zadig.akeo.ie/ tool to install WinUSB drivers.

I have a strong suspicion that it has something to do with the AVRUSBTiny drivers. I had to do a lot of playing around with the WinUSB stuff to get that to work.