Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 18:30:16 +0000 (19:30 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 18:30:16 +0000 (19:30 +0100)
commit5dce4148a3d30cbc0ca434049761434c5cc8cb33
treed6f70260db08aee9ca2f728c4cedeea081d739bf
parent465f78021e609719bf25b7d2933c47b7ab1b6940
parent7fd114bab72e4cc9bdb7a0017055b68ea7523f0a
Merge branch 'master' of ssh://git.samba.org/data/git/samba