Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
authorJohn Emmas <johne53@tiscali.co.uk>
Wed, 18 Sep 2013 09:16:40 +0000 (10:16 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Wed, 18 Sep 2013 09:16:40 +0000 (10:16 +0100)

Trivial merge