From 78287beae8a79d80acdcbf11cb48bc191e275a5d Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sun, 16 Jan 2005 14:34:02 +0000
Subject: [PATCH] Merged revisions 473:474 from the trunk