r26387: Merge logfile segfault into alpha2 branch.