From b33cd44fac15b354b3d9dca0bc9e74c22175e66c Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Thu, 26 Jul 2007 08:49:44 +0000
Subject: [PATCH] Manual tweaks of patch from Jasper on July 26.