From c4dd50127f9bc418093be07442cdd07f557f059b Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Wed, 1 Nov 2006 13:01:08 +0000
Subject: [PATCH] Merged revisions 891:908 from trunk