Merge branch 'gav' of github.com:ethereum/cpp-ethereum into gav

Conflicts:
	mix/MixClient.cpp

libethereum/State.cpp

@@ -1212,7 +1212,7 @@ ExecutionResult State::execute(LastHashes const& _lh, Transaction const& _t, Per
 	uncommitToMine();
 
 	// OK - transaction looks valid - execute.
-	u256 startGasUsed = gasUsed();
+	u256 startGasUsed = e.gasUsed();
 #if ETH_PARANOIA
 	ctrace << "Executing" << e.t() << "on" << h;
 	ctrace << toHex(e.t().rlp());

mix/MixClient.cpp

@@ -313,12 +313,6 @@ pair<h256, Address> MixClient::submitTransaction(eth::TransactionSkeleton const&
 	return make_pair(t.sha3(), toAddress(ts.from, ts.nonce));
 }
 
-Address MixClient::lastCreatedContractAddr() const
-{
-	Transaction tr =  m_state.pending().back();
-	return tr.isCreation() ? right160(sha3(rlpList(tr.sender(), tr.nonce()))) : Address();
-}
-
 dev::eth::ExecutionResult MixClient::call(Address const& _from, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, BlockNumber _blockNumber, bool _gasAuto, FudgeFactor _ff)
 {
 	(void)_blockNumber;