From b47b8085dbf46764c47ba83b54b147f2eb71cb76 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sat, 21 Jun 2008 09:18:02 +0000
Subject: [PATCH] Merged -r1500:1510 from the trunk.