[merge] Drop glyf hints

Since we don't renumber functions or CVTs, we have to drop hinting
for now.
diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py
index 8a30bbb..92c170a 100644
--- a/Lib/fontTools/merge.py
+++ b/Lib/fontTools/merge.py
@@ -126,7 +126,9 @@
 	self.glyphs = {}
 	for table in m.tables:
 		self.glyphs.update(table.glyphs)
-	# TODO Drop hints?
+	# Drop hints for now, since we don't remap functions / CVT values.
+	for g in self.glyphs.values():
+		g.removeHinting()
 	return True
 
 @_add_method(ttLib.getTableClass('prep'),
@@ -357,8 +359,11 @@
 		return mega
 
 	def _mergeGlyphOrders(self, glyphOrders):
-		"""Modifies passed-in glyphOrders to reflect new glyph names."""
+		"""Modifies passed-in glyphOrders to reflect new glyph names.
+		Returns glyphOrder for the merged font."""
 		# Simply append font index to the glyph name for now.
+		# TODO Even this simplistic numbering can result in conflicts.
+		# But then again, we have to improve this soon anyway.
 		mega = []
 		for n,glyphOrder in enumerate(glyphOrders):
 			for i,glyphName in enumerate(glyphOrder):