Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 14 Sep 2013 20:24:46 +0000 (16:24 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 14 Sep 2013 20:24:46 +0000 (16:24 -0400)

Trivial merge