Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 25 Aug 2012 10:22:29 +0000 (12:22 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 25 Aug 2012 10:22:29 +0000 (12:22 +0200)

Trivial merge