[MERGE] updated deprecation of VersionedFile.clear_cache and enable_cache

[Robert Collins]

As before - time for this to go.
-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: api-cleanup-3328.patch
Type: text/x-patch
Size: 34808 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080409/b92f4b64/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080409/b92f4b64/attachment-0001.pgp