Merge branch 'totalblocksestimate1' of https://github.com/laanwj/bitcoin

diff --cc src/main.cpp
Simple merge

diff --cc src/main.h
index 3b35387,73935bc..aa74ac5
--- 1/src/main.h
--- 2/src/main.h
+++ b/src/main.h
@@@ -96,8 -115,10 +96,9 @@@ void GenerateBitcoins(bool fGenerate, C
  CBlock* CreateNewBlock(CReserveKey& reservekey);
  void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce, int64& nPrevTime);
  void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1);
 -bool CheckWork(CBlock* pblock, CReserveKey& reservekey);
 -void BitcoinMiner();
 +bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
  bool CheckProofOfWork(uint256 hash, unsigned int nBits);
+ int GetTotalBlocksEstimate();
  bool IsInitialBlockDownload();
  std::string GetWarnings(std::string strFor);