Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
commit1df5ca6afab3aeac43dfe4773cba1b9ce4d488f5
authorAndrew Bartlett <abartlet@samba.org>
Tue, 21 Apr 2009 10:20:37 +0000 (21 12:20 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 21 Apr 2009 10:20:37 +0000 (21 12:20 +0200)
tree753f1ec342fd54793e6ab795ef0064cb4f2e48e2
parentf128bfd44988a4db90222e7d5af5ab94337a065d
parent9b044be82906b651a70085898809bac0e77d832a
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel