From f34812f66fd9b26e4e294717cb2b781d0baedf45 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sat, 13 Sep 2008 04:50:05 +0000
Subject: [PATCH] Updated unstable branch (merged -r1512:1581 from the trunk).