From 26fa177487d0d7fe6f8a6e5358189fced1bb46c6 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Mon, 2 Jul 2007 03:28:37 +0000
Subject: [PATCH] Merged revisions 1130:1133 from the trunk.