Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 29 Jan 2009 23:27:42 +0000 (15:27 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 29 Jan 2009 23:27:42 +0000 (15:27 -0800)
commit164fd3cb3398b14fa02f13e5618465678b27ad07
tree5c427a1e145d0e922d65339b0ffe56db2911908c
parentd177015a6d43fcc26a823e52b86850a82261ad4d
parentaeb23872e25fb720140a10ce01a4211d228b6555
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba