Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Thu, 28 May 2009 06:12:34 +0000 (16:12 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 28 May 2009 06:12:34 +0000 (16:12 +1000)
commit5ab03dbecc33320e23304b126f26bde3f6bc6c7d
treef8478334db04fe03f6ed0a88622a50fe2586b91c
parent47692f39b1b3b5c589bfb63a6968aaf9f9af70c4
parentbd1194810787901c5caa08961f97fecbcbd01978
Merge branch 'master' of ssh://git.samba.org/data/git/samba