Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 1 Aug 2013 14:46:44 +0000 (10:46 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 1 Aug 2013 14:46:44 +0000 (10:46 -0400)

Trivial merge