From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 10 Apr 2009 00:02:20 +0000 (+0200)
Subject: Merge commit 'origin/master-tx'
X-Git-Tag: v0.9.15-test8~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6f019e429656695c33b5b65e270d6d05997aa1b;p=platform%2Fupstream%2Fpulseaudio.git

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

d6f019e429656695c33b5b65e270d6d05997aa1b