0.11-stable: also need to backport r7208, for the new pool.
Authored by: cboos 2008-07-04
Parent: [r7316]
Child: [r7318]