Merge branch 'nsm' of https://github.com/royvegard/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 5 Apr 2013 16:00:42 +0000 (12:00 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 5 Apr 2013 16:00:42 +0000 (12:00 -0400)

Trivial merge