Ticket #6134: Improve the mechanism differentiating template declarations from template definitions.
Merge pull request #432 from simartin/ticket_6134

Ticket #6134: Improve the mechanism differentiating template declarations from template definitions.