Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 3 Dec 2013 15:01:13 +0000 (10:01 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 3 Dec 2013 15:01:13 +0000 (10:01 -0500)

Trivial merge