merging fixes & changes from delft-sprint-2012

git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@611 4cde692c-a291-49d1-8350-778aa11640f8
diff --git a/Lib/fontTools/t1Lib.py b/Lib/fontTools/t1Lib.py
index c5e2e5c..42d95c2 100644
--- a/Lib/fontTools/t1Lib.py
+++ b/Lib/fontTools/t1Lib.py
@@ -143,7 +143,7 @@
 
 def readLWFN(path, onlyHeader=0):
 	"""reads an LWFN font file, returns raw data"""
-	resRef = Res.FSpOpenResFile(path, 1)  # read-only
+	resRef = Res.FSOpenResFile(path, 1)  # read-only
 	try:
 		Res.UseResFile(resRef)
 		n = Res.Count1Resources('POST')
@@ -217,7 +217,7 @@
 
 def writeLWFN(path, data):
 	Res.FSpCreateResFile(path, "just", "LWFN", 0)
-	resRef = Res.FSpOpenResFile(path, 2)  # write-only
+	resRef = Res.FSOpenResFile(path, 2)  # write-only
 	try:
 		Res.UseResFile(resRef)
 		resID = 501