From cc7030ff2e8550a1848496cba64f2173a994504e Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sat, 7 Nov 2009 15:15:34 +0000
Subject: [PATCH] Fixes for Mac OS X. Not tested on other platforms yet.