Merge "Use gcc 4.6"