am d1081266: am a411bf01: Merge change 25818 into eclair

Merge commit 'd1081266712bdd1e8d37a83e5b561c2e05abd36d'

* commit 'd1081266712bdd1e8d37a83e5b561c2e05abd36d':
  Clean up some debugging and add 2 math lib routines.