Merge branch 'v3-2-stable' into my_branch
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Oct 2007 17:41:01 +0000 (19:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Oct 2007 17:41:01 +0000 (19:41 +0200)
commit98075c5542f63098be36d6c616af048714ba0dc7
tree5579b90de78135d4f04773241d9f15d80d29661b
parent2e21f1e30e236eb65f57cc5d3b506d5f8d24b2e9
parent20d1141ed82fff325a52672ebf9223885f552817
Merge branch 'v3-2-stable' into my_branch
(This used to be commit 754671b8be0bf73a9e1fe7ff420a1b7a1cd501b7)
source3/Makefile.in