From 2e09d18f27c50530348564bc251d05b318f899e1 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sun, 11 May 2008 12:25:31 +0000
Subject: [PATCH] Merged -r1410:1434 from the trunk.