[merge] trunk
authorJelmer Vernooij <jelmer@samba.org>
Fri, 16 Jun 2006 14:08:07 +0000 (16:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 16 Jun 2006 14:08:07 +0000 (16:08 +0200)
commit21629cf3d313f76a01da16aca63d351894db5e57
treeed80ae7631f669cc6aa8a687832d7fb98e27c33f
parent74dc39aa57ecbee826ff7d4fcb5b74aeaf1c58fc
parent02170af0c50d844769c3a887d90eee946db89b83
[merge] trunk
Makefile.settings.in
src/network.c
src/network.h
src/settings.c
src/settings.h