From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 Feb 2009 01:15:13 +0000 (+0100)
Subject: Merge branch 'master-tx'
X-Git-Tag: 1.0_branch~2165
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bd9737725b85d90a7cf12b82528c2de70a7fbfe;p=profile%2Fivi%2Fpulseaudio.git

Merge branch 'master-tx'

Conflicts:
	po/pl.po
---

4bd9737725b85d90a7cf12b82528c2de70a7fbfe