From 44fbbb7e7038fe61bd8c8d0e98bb0d91d917cede Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sat, 9 Jun 2007 14:36:03 +0000
Subject: [PATCH] Merged revisions 1112:1122 from the trunk.