Merge branch 'chaot4-bug_6129'
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 7 Dec 2015 22:57:07 +0000 (17:57 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 7 Dec 2015 22:57:07 +0000 (17:57 -0500)

Trivial merge