Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 04:34:43 +0000 (14:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 04:34:43 +0000 (14:34 +1000)
commit0e429dd1fb15137a2a7c25e051b9af8c4ed8c7f3
tree3ccadd8fdc9c9552ed666dd81a6fe226adbcfe2a
parent8e070293cfd522b7464be5bc4d8045572d6d996c
parent0b7a6bfcba1b906dc4d461882b4c3fe3c91c44e0
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local