From 455f1d35f7fbcb67b8b9ef4aed55647f9517ced8 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sat, 20 Dec 2008 08:37:55 +0000
Subject: [PATCH] Merged -r1591:1600 from the trunk.