* Merged HEAD to cf (revisions 2395 to 2454).
Authored by: mandrav 2006-05-16
Parent: [r2454]
Child: [r2456]