Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 11 Nov 2008 16:11:57 +0000 (17:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 11 Nov 2008 16:11:57 +0000 (17:11 +0100)
commit634c87dd7718aaea9c6f2dbcb8992e0a82bd159a
tree21ecd40168481145cc6d629d5a74be039cdaa211
parent2f438b4cdeaacf55b0832bf71b2ef15b30cdd758
parentdee2c61ce0a5ff2485f4a0704c9d7288ca75cb52
Merge branch 'master' of ssh://git.samba.org/data/git/samba
source3/Makefile.in