Merge remote-tracking branch 'upstream/develop' into frontier/js

Conflicts:
	cmd/ethereum/js.go
	javascript/types.go

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/helper/common.go b/tests/helper/common.go
index 6a071968d..21ea2261f 100644
--- a/tests/helper/common.go
+++ b/tests/helper/common.go
@@ -1,11 +1,11 @@
 package helper
 
-import "github.com/ethereum/go-ethereum/ethutil"
+import "github.com/ethereum/go-ethereum/common"
 
 func FromHex(h string) []byte {
-	if ethutil.IsHex(h) {
+	if common.IsHex(h) {
 		h = h[2:]
 	}
 
-	return ethutil.Hex2Bytes(h)
+	return common.Hex2Bytes(h)
 }