PR c++/495
	* pt.c (tsubst_friend_class): Only use innermost template
	arguments for the injected friend class template.

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

From-SVN: r71574