Merge branch 'master' of ssh://dbrownell@openocd.git.sourceforge.net/gitroot/openocd...
authorDavid Brownell <dbrownell@users.sourceforge.net>
Fri, 6 Nov 2009 23:01:46 +0000 (15:01 -0800)
committerDavid Brownell <dbrownell@users.sourceforge.net>
Fri, 6 Nov 2009 23:01:46 +0000 (15:01 -0800)

Trivial merge