From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 10 Aug 2009 19:34:03 +0000 (+0200)
Subject: Merge commit 'origin/master-tx'
X-Git-Tag: v0.9.16-test5~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a99e3b54914b760fd19c7834a108e78b24e71921;p=platform%2Fupstream%2Fpulseaudio.git

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

a99e3b54914b760fd19c7834a108e78b24e71921