Merging from trunk

svn path=/branches/release/libs/preprocessor/; revision=84745