Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi
authorLennart Poettering <lennart@poettering.net>
Tue, 31 Mar 2009 23:03:34 +0000 (01:03 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 31 Mar 2009 23:03:34 +0000 (01:03 +0200)

Trivial merge