r1962: fixing schema file; synching with trunk; trying to prevent this from happening...