Merge from trunk to clang_3.5 branch r581:
------------------------------------------------------------------------
r581 | kim.grasman@gmail.com | 2014-09-16 21:03:33 +0200 (Tue, 16 sep 2014) | 1 line

Remove misguided template keyword to fix GCC build.
------------------------------------------------------------------------

git-svn-id: http://include-what-you-use.googlecode.com/svn/branches/clang_3.5@582 812d1f90-f944-d88a-411a-122bdc93e1ea