Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 29 Jan 2009 23:31:56 +0000 (15:31 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 29 Jan 2009 23:31:56 +0000 (15:31 -0800)
commitc1332943db6630c1dd916040bdbc9f7627ade148
treebd3881893bb50ee5962c8060c7556250db289c7f
parent164fd3cb3398b14fa02f13e5618465678b27ad07
parentd1ab1b6482d7413337b42de83d7de1ae016d33e1
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba