Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 18 Nov 2008 00:36:02 +0000 (01:36 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 18 Nov 2008 00:36:02 +0000 (01:36 +0100)
commit1c07c30d31b4b588b59b845bdb5f85a0ba19f762
treefe6e815464ae0ab1397567150978e04ea4fb3d46
parentab55ecb881bfabe427ecb874d2dff2b5c2a7e84a
parent9ea794417e8bad3da4236f4071a0d8a23612ac8a
Merge branch 'master' of ssh://git.samba.org/data/git/samba