[SCM] tilestache branch, master, updated. debian/1.31.0-1-18-gcb2425f

[Andrew Harvey]

The following commit has been merged in the master branch:
commit 1ee4ba219e63df855e8346f4d59943cc368ec4d2
Merge: 29ccefc2d6eedd12f63bfda301a24d3f4fb1dc62 5e7a21412bb210b0b616d2855f08419378985248
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sat Oct 13 11:54:36 2012 +1100

    Merge tag 'upstream/1.42.1'
    
    Upstream version 1.42.1


-- 
map tiles caching system