Merging from trunk

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