Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 16 Dec 2008 20:17:54 +0000 (07:17 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 16 Dec 2008 20:17:54 +0000 (07:17 +1100)
commit1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3
treecee337a9c93890605fb12490faec2a7f0b2188d8
parente294c4799bf6ad8da043aadf8341391644147056
parent54dc421f5820099531a77879f52a904c2fefcf49
Merge branch 'master' of ssh://git.samba.org/data/git/samba