Merge svn r30200 (reindent configure)