Use the CACHEDIR variable instead of DATADIR.
Merge branch 'master', remote branch 'origin' into squeeze