Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 18 Oct 2008 16:30:10 +0000 (18:30 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 18 Oct 2008 16:30:10 +0000 (18:30 +0200)
1  2 
lib/util/util_str.c

Simple merge