GCC 4.6 merge