Merged r10666:10669 from jblum/vlen. Trunk passes distcheck.