* cp/decl2.c (arg_assoc_class): Correct check for namespace-scope
	friends.
	* cp/pt.c (instantiate_class_template): Fix formatting.

	* g++.dg/template/friend17.C: New test.

From-SVN: r64645