From c710a39b9e95afdbc0b950552c11e928a5997024 Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Wed, 30 Jan 2013 23:53:23 +0100
Subject: [PATCH] Resolved merge conflict