Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Fri, 21 Aug 2009 19:30:36 +0000 (21:30 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 21 Aug 2009 19:30:36 +0000 (21:30 +0200)
commit43e0a7f669d782e73513119b7140dc4e56bcc3d7
treeee0e2cd080b7c55200d00d1a0f50e48feace0c2f
parent174e032ea3bf040bc8ef9c35832d254126f1c09c
parentbd55215eb1f1c8d041170743dcee5e069d5706b8
Merge branch 'master' into next
daemon.c