Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 23:27:40 +0000 (00:27 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 23:27:40 +0000 (00:27 +0100)
commitd1f203ea37e3b3ca0ac6db268331961caa47d705
treeeeff64ce59657ba5aba48ba9f979af1d67173f76
parenta4eb244ecdf9aaa0f167b3c91d3e276bde99d681
parent06c82519ac27d0c34e1b6e0c1a1f088fe34e61b3
Merge branch 'maint'

Conflicts:
server.c
server.c