Merge branch 'ovenwerks-master'
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 10 Aug 2015 02:28:00 +0000 (22:28 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 10 Aug 2015 02:28:00 +0000 (22:28 -0400)

Trivial merge