From 025ec20344ee5ca7e5ef8d0b0bcdf3ecf403e18d Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Thu, 13 Aug 2009 08:07:48 +0000
Subject: [PATCH] Merged c1873 from the trunk.