[C++-sig] Trunk OK?