am 3faf4c48: am b72d0474: Merge "Use gcc 4.6"

* commit '3faf4c4879c9ec35d464774444b75a2e6b4224a6':
  Use gcc 4.6