Merged cache brunch to trunk: 306:323 /framework/branches/cache
Authored by: artyom-beilis 2008-06-08
Parent: [r329]
Child: [r331]