Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 15 Jan 2014 21:10:09 +0000 (16:10 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 15 Jan 2014 21:10:09 +0000 (16:10 -0500)

Trivial merge