This fixes a shift-reduce conflict in the parser that causes e.g. "static const int" to be rejected as a syntax error. This patch should have been handled by upstream, but there doesn't seem to be an upstream.
