mergme

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