Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit02996093088a9244c44f46818ac093430d21a99c
authorAndrew Tridgell <tridge@samba.org>
Tue, 26 May 2009 04:18:16 +0000 (26 14:18 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 26 May 2009 04:18:16 +0000 (26 14:18 +1000)
treee635307f9ba9c259b183fdcbc6bd0c5d096718da
parentc80c3b5edd231ab919b2054e22a99ba28aa11eac
parent6ef65389fd2f2bdcafe840e0cd0221bb9f26bdfc
Merge branch 'master' of ssh://git.samba.org/data/git/samba