Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 24 Mar 2013 21:06:46 +0000 (17:06 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 24 Mar 2013 21:06:46 +0000 (17:06 -0400)

Trivial merge