Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 16 Jan 2014 01:40:11 +0000 (20:40 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 16 Jan 2014 01:40:11 +0000 (20:40 -0500)

Trivial merge