diff -r acca351fb8f0 -r e619e18dcec3 roster_test.go
--- a/roster_test.go	Thu Jan 19 11:06:42 2012 -0600
+++ b/roster_test.go	Thu Jan 19 12:25:36 2012 -0600
@@ -5,10 +5,10 @@
 package xmpp
 
 import (
+	"encoding/xml"
 	"reflect"
 	"strings"
 	"testing"
-	"xml"
 )
 
 // This is mostly just tests of the roster data structures.