Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Fri, 6 Jul 2012 23:39:08 +0000 (01:39 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Fri, 6 Jul 2012 23:39:08 +0000 (01:39 +0200)

Trivial merge