Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 23 Sep 2008 18:15:46 +0000 (11:15 -0700)
committerAndrew Tridgell <tridge@samba.org>
Tue, 23 Sep 2008 18:15:46 +0000 (11:15 -0700)
commit66092ced5e1dc4d35923a3c90bcb3214a885b17d
treed40fd46e86244f1b45abda2a95c8fe84bfc88c3c
parent9cf29abee296ea2fcdf712687a6ce2cf9fd9d74c
parent353aaf26c5f71d9a94e799a1c1e37449211e7a87
Merge branch 'master' of ssh://git.samba.org/data/git/samba