Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 16 Dec 2008 00:41:20 +0000 (11:41 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 16 Dec 2008 00:41:20 +0000 (11:41 +1100)
commitf448fde4e35e56508ad93be8de9f60d88e8b8dcd
tree597b58ba1af03f5250af918ec15300c385281706
parenta226d86dcec393b2cd657d5441c3041dfdf5cd8f
parent530758dc2a6dd6dce083789b328e16e51ba6573d
Merge branch 'master' of ssh://git.samba.org/data/git/samba