change the debug print macro define to use the bitcoin's.
Merge remote-tracking branch 'remotes/bruce/master' into workspace