Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Fri, 25 Oct 2013 21:05:15 +0000 (23:05 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Fri, 25 Oct 2013 21:05:15 +0000 (23:05 +0200)

Trivial merge