Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 31 Mar 2013 13:35:15 +0000 (09:35 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 31 Mar 2013 13:35:15 +0000 (09:35 -0400)

Trivial merge