Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
authorAndrew Bartlett <abartlet@samba.org>
Tue, 10 Mar 2009 20:58:42 +0000 (07:58 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 10 Mar 2009 20:58:42 +0000 (07:58 +1100)
commit3d0a727f575942b767e396b694f6529259528a17
tree8ea6acdfe1b043abe06a0f3d78dcbc1b55d6f146
parentc218d3e1173355acf025471a10b4b6425b9c086b
parent3d280639c4652d6cd35577e333bcd46c2517754c
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema