From fc45f7dffd8994a2141e3fcb2c90b4d044e142e5 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 24 Jun 2008 22:34:34 +0200
Subject: [PATCH] Merge branch 'master'; commit 'cce02bf6' into master-tx

-- 
2.47.3