Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorJelmer Vernooij <jelmer@samba.org>
Tue, 9 Sep 2008 17:27:00 +0000 (19:27 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 9 Sep 2008 17:27:00 +0000 (19:27 +0200)
commitc3d1b0097590566417bda3fa33a64e994c9c7526
tree128d7d5b1d6a58ed0a457475aa00e1419d33056b
parent151c78652a89146049a134f60aef509c2117c436
parentab41017896e08d32c8a87bf172654ff2db6b6f1a
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel