Merged [3264:3323/trunk]. Starting point for the new cache.
Authored by: cboos 2006-05-20
Parent: [r3323]
Child: [r3325]