Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 30 Oct 2008 00:10:04 +0000 (17:10 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 30 Oct 2008 00:10:04 +0000 (17:10 -0700)
commit031c5d2753281ac4e8ae2a46f4e1b4bf19d2fa70
tree12991ac1d620c52a298811b3d38be6f04e2ee79c
parent0a6ff29e290123aa70daa8e293426249453352ce
parent753af36a3e194f645ec0b68a033199035e71c909
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba