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

Trivial merge