planning a merge

[Lars Gullik Bjønnes]

Since I don't know of any specific issues that needs resolving wrt. to
change to std::string I will merge the string-switch branch back into
the main trunk.

I will also release a prerelease to get people to try it out, and
discover the bugs that the change caused (0% probability of no bugs).

        Lgb