Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorunknown <Ben>
Fri, 18 Apr 2014 14:35:49 +0000 (09:35 -0500)
committerunknown <Ben>
Fri, 18 Apr 2014 14:35:49 +0000 (09:35 -0500)

Trivial merge