Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 7 Jun 2013 21:52:12 +0000 (17:52 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 7 Jun 2013 21:52:12 +0000 (17:52 -0400)

Trivial merge