Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts:
	src/main.cpp

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/script.cpp
Simple merge

diff --cc src/serialize.h
Simple merge

diff --cc src/util.cpp
Simple merge

diff --cc src/util.h
index 7fd224c,3d7ef10..fabcaf9
--- 1/src/util.h
--- 2/src/util.h
+++ b/src/util.h
@@@ -65,16 -65,8 +65,8 @@@ typedef unsigned long long  uint64
  #endif
  
  // This is needed because the foreach macro can't get over the comma in pair<t1, t2>
 -#define PAIRTYPE(t1, t2)    pair<t1, t2>
 +#define PAIRTYPE(t1, t2)    std::pair<t1, t2>
  
- // Used to bypass the rule against non-const reference to temporary
- // where it makes sense with wrappers such as CFlatData or CTxDB
- template<typename T>
- inline T& REF(const T& val)
- {
-     return (T&)val;
- }
- 
  // Align by increasing pointer, must have extra space at end of buffer
  template <size_t nBytes, typename T>
  T* alignup(T* p)

diff --cc src/wallet.cpp
index 076a9f8,8bbb80c..9c04e37
--- 1/src/wallet.cpp
--- 2/src/wallet.cpp
+++ b/src/wallet.cpp
@@@ -270,11 -268,15 +268,15 @@@ bool CWallet::AddToWallet(const CWallet
          {
              if (txout.scriptPubKey == scriptDefaultKey)
              {
-                 SetDefaultKey(GetOrReuseKeyFromPool());
-                 SetAddressBookName(CBitcoinAddress(vchDefaultKey), "");
+                 std::vector<unsigned char> newDefaultKey;
+                 if (GetKeyFromPool(newDefaultKey, false))
+                 {
+                     SetDefaultKey(newDefaultKey);
+                     SetAddressBookName(CBitcoinAddress(vchDefaultKey), "");
+                 }
              }
          }
 -
 +#endif
          // Notify UI
          vWalletUpdated.push_back(hash);
  

diff --cc src/wallet.h
Simple merge