Merge branch 'feature/extra-usbserial-interface' into edge
authorMichael Moon <triffid.hunter@gmail.com>
Thu, 3 Jan 2013 10:56:50 +0000 (21:56 +1100)
committerMichael Moon <triffid.hunter@gmail.com>
Thu, 3 Jan 2013 10:56:50 +0000 (21:56 +1100)

Trivial merge