From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Fri, 1 Apr 2011 11:02:24 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into HEAD
X-Git-Tag: v0.5.0-rc1~113
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3b7c9585db2dd49b48123d50e9e8af7bc527be52;p=openocd

Merge remote branch 'origin/master' into HEAD
---

3b7c9585db2dd49b48123d50e9e8af7bc527be52