[mapnik: 3/3] Initial pseudo merge for dist-git setup

[alexlan]

commit 9fb533cd9246e9829352e0841405d0d44a74984a
Merge: a850bed 5897b2f a850bed
Author: Alex Lancaster <alexlan at fedoraproject.org>
Date:   Sun Oct 10 01:35:19 2010 -0400

    Initial pseudo merge for dist-git setup

---