Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sun, 16 Sep 2012 15:39:36 +0000 (17:39 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sun, 16 Sep 2012 15:39:36 +0000 (17:39 +0200)

Trivial merge