Paul Ferraro
committed
on 18 Oct 10
merge --depth=infinity -r108617:108625 from trunk