Merge from mainline (gomp-merge-2005-02-26).