From 412842400fb73140fd00a9992987d1f4969504e9 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sun, 4 Oct 2009 10:00:40 +0000
Subject: [PATCH] Merged c1902 from the trunk.