Merge commit 'origin/v4-0-test' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 13:28:44 +0000 (23:28 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 13:28:44 +0000 (23:28 +1000)
commit2bba77a768c3ed984af05b99c2f7781577d08ec3
tree3da960c13445721beafb3d45a73c5bb01a4205c5
parent1590494daf5abe43e43402e7602f92267bcda34b
parent84b5652d3e5766521436e4c7d59615b08b2bb198
Merge commit 'origin/v4-0-test' into v4-0-test