am b72d0474: Merge "Use gcc 4.6"

* commit 'b72d0474ab2a0d78b2fb61973920aba9d777094c':
  Use gcc 4.6