Merge fix for 140001.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 30 Oct 2007 22:10:40 +0000 (23:10 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 30 Oct 2007 22:10:40 +0000 (23:10 +0100)
commitf62048291705f349dfe4da4af122818fa8dd3376
tree9d7d6f0159f773b010635a1142c0943a14d803e3
parent36d2bec48f39d7dc9114690a0e5fa45660569779
parent197618a0fa3732f9a05b1eca5a313ee9c66854af
Merge fix for 140001.