From 3a033e856cbbe73047a6f12235e47446fa75592b Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sat, 21 Mar 2009 09:32:20 +0000
Subject: [PATCH] Merged -r1755:1770 from the trunk.