Merge branch 'master' of /home/jmcd/samba/git.samba.org/samba-master into mymaster
authorJim McDonough <jmcd@samba.org>
Fri, 17 Apr 2009 07:28:01 +0000 (09:28 +0200)
committerJim McDonough <jmcd@samba.org>
Fri, 17 Apr 2009 07:28:01 +0000 (09:28 +0200)
commit1214bf606d1cdf3f33b91ffe7cb4c349ce737d68
tree7294165dc644ddc3860831f02578c63dad7770ef
parent75ccf934ac09e5af68cfd5afdd75a1b32ca24287
parent05ea8daacabe62b6c20770a8518192c44e7eb763
Merge branch 'master' of /home/jmcd/samba/git.samba.org/samba-master into mymaster