[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

Andrew Sutton <andrew.n.sut...@gmail.com> writes:

| Committed.

Merge from trunk as of revision 201285.

We will have to watch out for Tom's Makefile rewrite work.

-- Gaby