Merge branch 'develop' of github.com:ethereum/go-ethereum into develop

ethereal/ui/gui.go

@@ -234,7 +234,7 @@ func (gui *Gui) update() {
 
 				gui.setWalletValue(object.Amount, nil)
 
-				state.SetStateObject(object)
+				state.UpdateStateObject(object)
 			}
 		}
 	}

ethereum/repl.go

@@ -53,6 +53,10 @@ type JSEthereum struct {
 	vm *otto.Otto
 }
 
+func (self *JSEthereum) GetBlock(hash string) otto.Value {
+	return self.toVal(self.PEthereum.GetBlock(hash))
+}
+
 func (self *JSEthereum) GetKey() otto.Value {
 	return self.toVal(self.PEthereum.GetKey())
 }