Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 3 Sep 2013 12:50:38 +0000 (08:50 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 3 Sep 2013 12:50:38 +0000 (08:50 -0400)

Trivial merge