From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 24 Aug 2009 01:31:03 +0000 (+0200)
Subject: Merge commit 'origin/master-tx'
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/60a350209ded62b9c2d1d948d3e71d2982477566

Merge commit 'origin/master-tx'
---

60a350209ded62b9c2d1d948d3e71d2982477566