From a0dff2e2565a5f85ba26eb5d50c7e04d33f4474a Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sun, 4 Oct 2009 09:58:27 +0000
Subject: [PATCH] Merged r1896:1900 from the trunk.