Merge commit 'origin/v3-2-test' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Wed, 11 Feb 2009 12:15:42 +0000 (13:15 +0100)
committerMichael Adam <obnox@samba.org>
Wed, 11 Feb 2009 12:15:42 +0000 (13:15 +0100)
commit982924ac829a493a9b0e325ac2a6ca7212d7f1a3
tree967147ec167d4cf251bb8d784d9b1a7b61adf032
parentc98cb1395d11c22db979b793e82ee9c6022bb66f
parentfe30a4abe24f8aceb9966b250c55ad2e3b4ffc82
Merge commit 'origin/v3-2-test' into v3-2-ctdb
source/Makefile.in