Merge branch 'ovenwerks-master'
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 4 Jun 2015 22:23:08 +0000 (18:23 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 4 Jun 2015 22:23:08 +0000 (18:23 -0400)

Trivial merge