Proposed resolution (September, 2010):

Change the definition of type-name in 9.2.9.3 [dcl.type.simple] paragraph 1 as follows:

type-name:
class-name
enum-name
typedef-name
simple-template-id