Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Fri, 10 Apr 2009 05:46:59 +0000 (22:46 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 10 Apr 2009 05:46:59 +0000 (22:46 -0700)
commit7f10bf980edef3ace1522d0c9c082b35e225c950
treed4e9af21de194cca812e754b28f9358a3651f4ce
parentf8f68703da58cf7f61b655b48bbbc45cda647748
parentf930f504e1d5e78d2f6f36cab9ce36dbeb34e955
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba