Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Fri, 1 Feb 2013 22:24:06 +0000 (23:24 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Fri, 1 Feb 2013 22:24:06 +0000 (23:24 +0100)

Trivial merge