Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 20:41:02 +0000 (22:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 20:41:02 +0000 (22:41 +0200)
1  2 
source4/configure.ac

Simple merge