am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo

Merge commit 'c8e84e12beb876f904d0090fe021beae73722786' into kraken

* commit 'c8e84e12beb876f904d0090fe021beae73722786':
  Fix imf tests.