Importing ViewVC 1.1.18
Importing ViewVC 1.1.19
Importing ViewVC 1.1.20
Merging in upstream updates