Merge branch 'vendor/GCC47'
authorCharlie <root@banshee.synsport.com>
Sat, 20 Oct 2012 10:10:13 +0000 (12:10 +0200)
committerCharlie <root@banshee.synsport.com>
Sat, 20 Oct 2012 10:10:13 +0000 (12:10 +0200)

Trivial merge