Merge branch 'vendor/GCC47'
authorJohn Marino <draco@marino.st>
Mon, 1 Oct 2012 10:43:18 +0000 (12:43 +0200)
committerJohn Marino <draco@marino.st>
Mon, 1 Oct 2012 10:43:18 +0000 (12:43 +0200)

Trivial merge