From 0c3d282923b00adb1da703a09ad608d461d08080 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sat, 16 May 2009 05:19:13 +0000
Subject: [PATCH] Merged -r1772:1791 from the trunk.