The last merge before tomorrow's merge to trunk, bringing in Stevens' c-family changes. Bootstrapped/regtested on x86_64/linux, no regressions, all languages + ada, obj-c++. -- Laurynas