mergme

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