Merge branch 'v3-2-stable' into my_branch
commit754671b8be0bf73a9e1fe7ff420a1b7a1cd501b7
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Oct 2007 17:41:01 +0000 (12 19:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Oct 2007 17:41:01 +0000 (12 19:41 +0200)
tree0c344b762fbad43549d20937bce57cab8d4e3e98
parent9475993dae06fa023f2eb63d04d5f7b07b0b4d93
parent4ac867f5588e902358eba7bcb4dbfd431181943d
Merge branch 'v3-2-stable' into my_branch
source/Makefile.in