Merge remote-tracking branch 'gravitystorm/compiler'
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 15:31:15 +0000 (16:31 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 15:31:15 +0000 (16:31 +0100)

Trivial merge