Merging from trunk

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