[MERGE] 1/2: Populate cache_mem on disk hits

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1250159913.26060.9.camel%40henriknordstrom.net%3E
Project: Bazaar