From 297267b9c4e297cc1c26dbc1e6d0be476443f128 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 4 Jul 2008 00:34:32 +0300
Subject: [PATCH] Merge branches 'master' and 'master' of
 ssh://rootserver/home/lennart/git/public/pulseaudio