Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 15 Dec 2012 20:03:22 +0000 (21:03 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 15 Dec 2012 20:03:22 +0000 (21:03 +0100)

Trivial merge