From 4e354fe4dc94b8aabe14258164ce269ae9f642d5 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Tue, 1 Feb 2011 07:05:44 +0000
Subject: [PATCH] [0.21.1] Merged fix for #749 from the trunk (c2421).