From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Dec 2008 21:34:08 +0000 (+0100)
Subject: Merge commit 'flameeyes/master'
X-Git-Url: http://git.meshlink.io/?p=catta;a=commitdiff_plain;h=c3c0f3d47e49ab6814d4de3ee41a0c5caf0265b9

Merge commit 'flameeyes/master'
---

c3c0f3d47e49ab6814d4de3ee41a0c5caf0265b9