Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 20:09:34 +0000 (16:09 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 20:09:34 +0000 (16:09 -0400)

Trivial merge