Builtbot now puts the merge commit last (apparently) in the list of changes.