Merge branch 'master' of github.com:novacoin-project/novacoin

diff --combined src/rpcwallet.cpp
index 5ff8320,aa8f876..b96f5c1
--- 1/src/rpcwallet.cpp
--- 2/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@@ -1511,7 -1511,7 +1511,7 @@@ void ThreadCleanWalletPassphrase(void* 
      {
          nWalletUnlockTime = nMyWakeTime;
  
-         do
+         for ( ; ; )
          {
              if (nWalletUnlockTime==0)
                  break;
@@@ -1523,7 -1523,7 +1523,7 @@@
              Sleep(nToSleep);
              ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);
  
-         } while(1);
+         };
  
          if (nWalletUnlockTime)
          {
@@@ -1898,6 -1898,9 +1898,6 @@@ Value newmalleablekey(const Array& para
              "newmalleablekey\n"
              "Make a malleable public/private key pair.\n");
  
 -    if (!(fDebug || fTestNet) && GetTime() < SMALLDATA_SWITCH_TIME)
 -        throw runtime_error("This feature has been disabled for mainNet clients");
 -
      // Parse the account first so we don't generate a key if there's an error
      string strAccount;
      if (params.size() > 0)