Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Mon, 22 Sep 2008 21:23:40 +0000 (14:23 -0700)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 22 Sep 2008 21:23:40 +0000 (14:23 -0700)
commitb18449dbd587e978a65d8de3b8df96371d4bcdcb
treeb80b384832e380ee0a5c8d358c9ee7f85d2c6d0f
parentcebd9a9013a76073c3035b74175d228116fc7e48
parent92ebd6afc9a1979d5a08af1f7964032763d8fc5b
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel