From a30a3e58ebfa6bd261e1b701cd49ab2e76807f82 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Fri, 27 Feb 2009 15:20:28 +0000
Subject: [PATCH] Merged -r1527:1752 from the trunk.