From eafbe4ea262043b89e9947c67b3a5f3ebbd99a5e Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sun, 16 Jan 2005 16:14:08 +0000
Subject: [PATCH] Merged revisions 489:490 from trunk