Merge branch 'master' of https://github.com/texane/stlink
authorKarl Palsson <karlp@tweak.net.au>
Sat, 22 Oct 2011 02:11:50 +0000 (02:11 +0000)
committerKarl Palsson <karlp@tweak.net.au>
Sat, 22 Oct 2011 02:11:50 +0000 (02:11 +0000)

Trivial merge