Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
authorJohn Emmas <johne53@tiscali.co.uk>
Fri, 9 Aug 2013 17:04:04 +0000 (18:04 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Fri, 9 Aug 2013 17:04:04 +0000 (18:04 +0100)

Trivial merge