Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 19 Mar 2013 14:25:31 +0000 (10:25 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 19 Mar 2013 14:25:31 +0000 (10:25 -0400)

Trivial merge