819f3877aa
I apparently merged badly and then committed diffs in a bad order and broke trunk.
I apparently merged badly and then committed diffs in a bad order and broke trunk.