0.12dev: merge remaining changes from 0.11-stable but those related to the egg cache.
Authored by: cboos 2009-07-30
Parent: [r8426]
Child: [r8428]