Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 5 Oct 2008 23:17:39 +0000 (01:17 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 5 Oct 2008 23:17:39 +0000 (01:17 +0200)
commit0866e86ee4fb776bf69337af6385d01a27445c9c
treeb538e177045939e4947609d604698d9ee1ad9e28
parent3b4b832d04b7683e670f89b451ba74bea7dab651
parent20c712a76eb7976265b905f871a95b707b81e8e2
Merge trunk.
src/settings.c