From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 2 Mar 2009 15:28:08 +0000 (+0100)
Subject: Merge commit 'coling/master'
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/7794108d177fd5c7e9485af6061c8188fa31c4e4

Merge commit 'coling/master'
---

7794108d177fd5c7e9485af6061c8188fa31c4e4