mergme

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