From 0a25ecab2a1748edec354afe9b646c191d2eaf77 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 04 Dec 2008 03:40:32 +0000
Subject: Merge commit 'upstream/101'

---
--
cgit v0.9.1