Merge branch 't/server_optional'
authorAndre Noll <maan@systemlinux.org>
Sun, 14 Nov 2010 14:32:45 +0000 (15:32 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 14 Nov 2010 14:32:45 +0000 (15:32 +0100)

Trivial merge