Commit 732783faa6fa5d68db18ce5e8be63b09576b2cff

Con Kolivas 2012-07-03T11:35:58

Merge branch 'bfl' Conflicts: miner.h