Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 18:51:35 +0000 (19:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 18:51:35 +0000 (19:51 +0100)
commit54dc421f5820099531a77879f52a904c2fefcf49
treedaf0685fb9cb93e41332592f2be087686afb7ccc
parentd59a79e5bb425d260af3261e88422eeaf1f1359c
parent4c3aea3f62a76fa62ead66d64941156375fc4501
Merge branch 'master' of ssh://git.samba.org/data/git/samba