From f093fd49a63a144e63e558aa3dcdc5de16d38b37 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Fri, 29 May 2009 14:54:53 +0000
Subject: [PATCH] Merged r1794:1797 from the trunk.