Merge branch 'master' of git.ardour.org:ardour/ardour
authorDavid Robillard <d@drobilla.net>
Sun, 24 Mar 2013 22:47:49 +0000 (18:47 -0400)
committerDavid Robillard <d@drobilla.net>
Sun, 24 Mar 2013 22:47:49 +0000 (18:47 -0400)

Trivial merge