Merge remote branch 'zonque/topic/osx'
authorLennart Poettering <lennart@poettering.net>
Tue, 5 Jan 2010 21:52:57 +0000 (22:52 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 5 Jan 2010 21:52:57 +0000 (22:52 +0100)
1  2 
src/pulsecore/rtpoll.c

Simple merge