v2, v3, integration branch

svn path=/branches/filesystem3/tools/wave/; revision=62649