Merge branch 'jl777' into FSM

# Conflicts:
#	src/main.cpp

diff --cc src/main.cpp
index e229406b9e66f2dd0fd74135a9b93aa8d9aaa13a,aa6bece1627d3b6d6caf1b68f18d180b02c03092..c94d48c92120ecc89455e2c7624a4b8023ecd5a0
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -1123,7 -1118,6 +1123,10 @@@ bool CheckTransactionWithoutProofVerifi
          }
          if ( txout.scriptPubKey.size() > IGUANA_MAXSCRIPTSIZE )
              return state.DoS(100, error("CheckTransaction(): txout.scriptPubKey.size() too big"),REJECT_INVALID, "bad-txns-vout-negative");
++<<<<<<< HEAD
 +  
++=======
++>>>>>>> jl777
          nValueOut += txout.nValue;
          if (!MoneyRange(nValueOut))
              return state.DoS(100, error("CheckTransaction(): txout total out of range"),

diff --cc src/wallet/rpcwallet.cpp
Simple merge