Merge branch 'trebmuh-patch-1'
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 23 Nov 2015 13:44:28 +0000 (08:44 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 23 Nov 2015 13:44:28 +0000 (08:44 -0500)

Trivial merge