Ported to current weekly.

decode_test.go

diff --git a/decode_test.go b/decode_test.go
index 3f5f60a..bd73dd4 100644
--- a/decode_test.go
+++ b/decode_test.go
@@ -3,7 +3,7 @@
 
 import (
 	. "launchpad.net/gocheck"
-	"goyaml"
+	"launchpad.net/goyaml"
 	"reflect"
 	"math"
 )

encode_test.go

diff --git a/encode_test.go b/encode_test.go
index 5753cfc..bc49558 100644
--- a/encode_test.go
+++ b/encode_test.go
@@ -3,7 +3,7 @@
 
 import (
 	. "launchpad.net/gocheck"
-	"goyaml"
+	"launchpad.net/goyaml"
 	"math"
 	//"reflect"
 )

goyaml.go

diff --git a/goyaml.go b/goyaml.go
index 3ea8332..60bd682 100644
--- a/goyaml.go
+++ b/goyaml.go
@@ -24,7 +24,7 @@
 		} else if _, ok := r.(*reflect.ValueError); ok {
 			panic(r)
 		} else if s, ok := r.(string); ok {
-			*err = os.ErrorString("YAML error: " + s)
+			*err = os.NewError("YAML error: " + s)
 		} else if e, ok := r.(os.Error); ok {
 			*err = e
 		} else {