I can't really make sense of this, they seem to be conflicting and of different origins, but I doubt it's worth my time to figure it out.
Also clean up the other one a bit.
git-svn-id: svn://localhost/ardour2/branches/3.0@13918 d708f5d6-7413-0410-9779-e7cbd77b26cf
... and voila, decent data. Good grief, what a mess that was.
git-svn-id: svn://localhost/ardour2/branches/3.0@13887 d708f5d6-7413-0410-9779-e7cbd77b26cf