Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 7 Jul 2012 15:55:08 +0000 (17:55 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 7 Jul 2012 15:55:08 +0000 (17:55 +0200)

Trivial merge