merge to trunk
authorHans Fugal <hans@fugal.net>
Fri, 11 Aug 2006 15:37:07 +0000 (15:37 +0000)
committerHans Fugal <hans@fugal.net>
Fri, 11 Aug 2006 15:37:07 +0000 (15:37 +0000)
git-svn-id: svn://localhost/ardour2/trunk@791 d708f5d6-7413-0410-9779-e7cbd77b26cf


Trivial merge