Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 02:58:08 +0000 (04:58 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 02:58:08 +0000 (04:58 +0200)
commit60164e9002c28911dbfd7115cb9bff05be5aff25
tree38c815b9b6cfd2b2e00b3e8b7ddedf6ba9e47099
parent391ce30d497503ce998d0c5dbab9ea7d4fe3ed3b
parent596089ec06b0a2b2ec3e0e5bd6d46c2e767bd954
Merge branch 'master' of ssh://git.samba.org/data/git/samba