PR c++/6256:
	* pt.c (tsubst_friend_class): Handle templates with explicit
	nested names.

	PR c++/6331:
	* typeck.c (merge_types): Remember the cv-qualification of pointer
	types when merging them.

	PR c++/6256:
	* g++.dg/template/friend5.C: New test.

	PR c++/6331:
	* g++.dg/template/qual1.C: Likewise.

From-SVN: r52661