Upstream changes: 5.70 Mon Sep 21 15:46 2009 - Merge trivial test change from core that was done as part of the lib-to-ext migration.
a8cfb4170b