From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 Aug 2009 02:14:00 +0000 (+0200)
Subject: Merge commit 'origin/master-tx'
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/b2cb8efd285d451723c8b30d4b319f5a0143bf01

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

b2cb8efd285d451723c8b30d4b319f5a0143bf01