Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Fri, 2 Jan 2009 19:39:04 +0000 (11:39 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 2 Jan 2009 19:39:04 +0000 (11:39 -0800)
commit11576353f645d7d7f44a74d27545b946c6175658
treea756a430d3fea82ac8a24144613d5d7e04d163f1
parent2234173220c51c2e37818149ddf41421672904c0
parent268f3e93a4dd66ce43dc53278eff01f801ba5083
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba