Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 26 Mar 2009 14:31:02 +0000 (15:31 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 26 Mar 2009 14:31:02 +0000 (15:31 +0100)
commit1e200c1952adab450909ac35252be4636c3e1053
tree575e1337aaec5cf8decb10567a4876c1650441c6
parentca202cf464aec82e63be4b2160f394f56b8c195e
parent853f9283fb8fbcd2078e3cf8e99d6c8e24d77346
Merge branch 'master' of git://git.samba.org/samba