Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit34ee56eadce9f84d52a1c9668cf321e04ede2bc0
authorAndrew Tridgell <tridge@samba.org>
Tue, 24 Mar 2009 05:29:24 +0000 (24 16:29 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 24 Mar 2009 05:29:24 +0000 (24 16:29 +1100)
tree7e417710edeecc5e8e3c8c40986c22ae0fec61f6
parent2a8f367b0ff567223144bd41e97684301d540f57
parent130582f170cdcc2b6eb2a950ca4ebda916c8399a
Merge branch 'master' of ssh://git.samba.org/data/git/samba