Merge branch 'ovenwerks-master'
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 27 Jul 2015 20:17:51 +0000 (16:17 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 27 Jul 2015 20:17:51 +0000 (16:17 -0400)

Trivial merge