Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
authorJohn Emmas <johne53@tiscali.co.uk>
Tue, 3 Sep 2013 14:58:58 +0000 (15:58 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Tue, 3 Sep 2013 14:58:58 +0000 (15:58 +0100)

Trivial merge