Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sun, 16 Dec 2012 01:55:42 +0000 (02:55 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Sun, 16 Dec 2012 01:55:42 +0000 (02:55 +0100)

Trivial merge