mergme

svn path=/sandbox-branches/straszheim/merge_me_into_trunk/LICENSE_1_0.txt; revision=53280