Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 16 Jan 2014 03:28:34 +0000 (22:28 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 16 Jan 2014 03:28:34 +0000 (22:28 -0500)

Trivial merge