From f68ca76515924d20b7a167a87e0ae679808824f0 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Wed, 9 Mar 2011 10:57:49 +0100
Subject: [PATCH] merged one of the pull requests, will look at the other
 tonight