Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sun, 19 Aug 2012 19:12:31 +0000 (21:12 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sun, 19 Aug 2012 19:12:31 +0000 (21:12 +0200)

Trivial merge