Merge branch 'per-device-usb-config'
authorAntonio Ospite <ospite@studenti.unina.it>
Mon, 25 Mar 2013 21:44:35 +0000 (22:44 +0100)
committerAntonio Ospite <ospite@studenti.unina.it>
Mon, 25 Mar 2013 21:44:35 +0000 (22:44 +0100)

Trivial merge