Merged r10948:10959 from jcorgan/deb into trunk. Trunk passes