Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Thu, 21 Feb 2013 17:40:59 +0000 (18:40 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Thu, 21 Feb 2013 17:40:59 +0000 (18:40 +0100)

Trivial merge