Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 4 Sep 2008 02:49:29 +0000 (12:49 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 4 Sep 2008 02:49:29 +0000 (12:49 +1000)
commit1929b2fb5106495fa3d155037e123dc920c6697b
tree33d3d8c7d5daa31e8a58c6d66e74a56f9f2bdb24
parente82f2187325274d728ec7470990f971e7b3db13c
parentfbbe799e4e68d79846614c6648307cc6b3f76906
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit c273d63f94c430a4f553085efb0d6e31a99e5853)
source4/scripting/python/misc.i
source4/scripting/python/misc_wrap.c