From a4a6ca2c0889b8cebec2a3a8ede2b13a008db36e Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sun, 16 Jan 2005 14:37:45 +0000
Subject: [PATCH] Merged revisions 472:473 and 481:482 from the trunk