From 42784a510fb17411c6ebf4e3133617e8e09f2930 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 03 Dec 2008 21:31:47 +0000
Subject: Merge commit 'upstream/48'

---
--
cgit v0.9.1