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/ttLib/macUtils.py b/Lib/fontTools/ttLib/macUtils.py
index 5e1f0cb..2d5aedb 100644
--- a/Lib/fontTools/ttLib/macUtils.py
+++ b/Lib/fontTools/ttLib/macUtils.py
@@ -15,7 +15,7 @@
 def MyOpenResFile(path):
 	mode = 1  # read only
 	try:
-		resref = Res.FSpOpenResFile(path, mode)
+		resref = Res.FSOpenResFile(path, mode)
 	except Res.Error:
 		# try data fork
 		resref = Res.FSOpenResourceFile(path, u'', mode)
@@ -104,7 +104,7 @@
 			os.remove(self.name)
 		# XXX datafork support
 		Res.FSpCreateResFile(self.name, 'DMOV', 'FFIL', 0)
-		self.resref = Res.FSpOpenResFile(self.name, 3)  # exclusive read/write permission
+		self.resref = Res.FSOpenResFile(self.name, 3)  # exclusive read/write permission
 	
 	def close(self):
 		if self.closed: