Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 20:12:27 +0000 (16:12 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 20:12:27 +0000 (16:12 -0400)

Trivial merge