mergme

svn path=/sandbox-branches/straszheim/merge_me_into_trunk/tools/wave/; revision=53280