Merge branch 'master' into exportvis
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 4 Dec 2013 16:49:02 +0000 (11:49 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 4 Dec 2013 16:49:02 +0000 (11:49 -0500)

Trivial merge