From 28ff429bc457035ed0a4f369caa5cc495eebf4f3 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Mon, 13 Aug 2007 14:48:04 +0000
Subject: [PATCH] Merged revisions 1150:1169 from the trunk.