Merge branch 'make-cross-tools'
authorTaylor R Campbell <campbell@mumble.net>
Sun, 6 Oct 2013 18:11:00 +0000 (18:11 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Sun, 6 Oct 2013 18:11:00 +0000 (18:11 +0000)

Trivial merge