Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Mon, 1 Jun 2009 12:04:00 +0000 (22:04 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 1 Jun 2009 12:04:00 +0000 (22:04 +1000)
commit50043177e842f791d33b52c1fca8be13682a0e0b
treee58cffe7a9f9320363ac15ef74aa8809dc63f2e4
parent73c8566d957af8c823a48912b66aae71b002259b
parent05be1cc717b4b35e0a78806330a7deaee89663e3
Merge branch 'master' of ssh://git.samba.org/data/git/samba