From 232bc3544ee28a3c6ffb1b5d10d3feab24a7394d Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Thu, 16 Nov 2006 10:30:57 +0000
Subject: [PATCH] Merged changes 974:976 from trunk