clean up some kwargs so we don't pass them along incorrectly..

[git-p4: depot-paths = "//depot/": change = 1666]

ZipStorage.py

@@ -204,6 +204,9 @@ class ZipFile(ZipItem, Item):
 		self.mimetype = kwargs['mimetype']
 		del kwargs['mimetype']
 		ZipItem.__init__(self, *args, **kwargs)
+		del kwargs['zf']
+		del kwargs['zo']
+		del kwargs['name']
 		self.zi = self.zf.getinfo(self.name)
 		kwargs['content'] = ZipResource(self.zf, self.name,
 		    self.mimetype)