Merged r11397:11413 from balister/arm-configure into trunk. Trunk passes distcheck.