Merging from trunk

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