Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Mon, 1 Jun 2009 00:39:30 +0000 (10:39 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 1 Jun 2009 00:39:30 +0000 (10:39 +1000)
commitba95882155db4f8c10725f47f70ae482d5343f9a
tree52c65ddfbcd81f3dcbb3b91183ae043b9c51acd5
parent67b83d2489788f1899c253fdab554d0998f9c044
parent14c13620345dfd9f1e18761f103aa66138bf8907
Merge branch 'master' of ssh://git.samba.org/data/git/samba