From 56678b2cde9679f07a54232ba82c4b8cb3bf1997 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sat, 18 Jul 2009 09:39:38 +0000
Subject: [PATCH] Merged r1833:1862 from the trunk.