Merge train change.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Oct 2007 23:30:13 +0000 (01:30 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Oct 2007 23:30:13 +0000 (01:30 +0200)
commitb0431f9cd21b1356c7b11503379e0a45c856e947
treea525ac7456d9590496bbcd22fd1f5f909fb47991
parent8195000781a9636f68ec48ea64bda04b85101690
parentb7b3041dfa8d4c9faa5a729dde8f104dda4f1ced
Merge train change.