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

Trivial merge