Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 7 Jul 2012 10:16:09 +0000 (12:16 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 7 Jul 2012 10:16:09 +0000 (12:16 +0200)

Trivial merge