Fix cases where one name is within another
Merge branch 'mozpseudo' into master2

Conflicts:
	lib/csspool/css/parser.y