Merge branch '0.4.x' into 0.5.0.x

Conflicts:
	src/keystore.h

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/keystore.h
index 4d88914,cb297c3..8aaf3e6
--- 1/src/keystore.h
--- 2/src/keystore.h
+++ b/src/keystore.h
@@@ -14,21 -13,12 +14,23 @@@ protected
      mutable CCriticalSection cs_KeyStore;
  
  public:
+     virtual ~CKeyStore() {}
+ 
 +    // Add a key to the store.
      virtual bool AddKey(const CKey& key) =0;
 +
 +    // Check whether a key corresponding to a given address is present in the store.
      virtual bool HaveKey(const CBitcoinAddress &address) const =0;
 +
 +    // Retrieve a key corresponding to a given address from the store.
 +    // Return true if succesful.
      virtual bool GetKey(const CBitcoinAddress &address, CKey& keyOut) const =0;
 +
 +    // Retrieve only the public key corresponding to a given address.
 +    // This may succeed even if GetKey fails (e.g., encrypted wallets)
      virtual bool GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char>& vchPubKeyOut) const;
 +
 +    // Generate a new key, and add it to the store
      virtual std::vector<unsigned char> GenerateNewKey();
  };
  

diff --cc src/main.cpp
Simple merge

diff --cc src/main.h
Simple merge

diff --cc src/util.cpp
Simple merge

diff --cc src/wallet.cpp
Simple merge

diff --cc src/wallet.h
Simple merge