Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 15:17:10 +0000 (16:17 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 15:17:10 +0000 (16:17 +0100)
commit161cb81911fe8877bfefd8bd3553f0b3166299fb
tree756a44809cab844f5c3fea0c47a8872b16ba665a
parentac428a22e6bdbf71fb848ec30e42c8795eb6e50b
parentf591c26dca25cc83046fb1a7c8616b0e476d830c
Merge branch 'master' of ssh://git.samba.org/data/git/samba