From b8f94745167682494c4b2bb2c8ede8a2ede5dc6b Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Wed, 17 Sep 2008 15:36:00 +0000
Subject: [PATCH] Merged -r1582:1587 from the trunk.