From 50743bcc6ee875ac6c17e1d48e4d4097888ed8a9 Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Tue, 29 Nov 2011 11:20:30 +0000
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'