Merge branch 'master' of git://git.samba.org/samba
commitc165770f943d157c11d44566558ae07bf901bd26
authorJelmer Vernooij <jelmer@samba.org>
Sat, 1 Nov 2008 02:15:59 +0000 (1 03:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 1 Nov 2008 02:15:59 +0000 (1 03:15 +0100)
treefaa9e7bfe5242aa7661c69b991ad7fa213806f8f
parent2c81fd70ca4997947275ce823f08c895000fbc3d
parent54eaf2de74b4779919ae97b54abceb3878894bf6
Merge branch 'master' of git://git.samba.org/samba