Merge branch 'led-handling'
authorPeter Hutterer <peter.hutterer@who-t.net>
Sun, 25 Aug 2013 23:53:10 +0000 (09:53 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Sun, 25 Aug 2013 23:53:10 +0000 (09:53 +1000)

Trivial merge