From 7a63e9fd0bf0e672c4a24e1206550b9864f27e4f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 11 Jul 2012 08:40:09 +0100
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'