r128438 introduced a hilarious piece of mergefuckery about five weeks ago.  eyeball this diff for a good laugh.  I've verified that the evil twin is *identical*.

reviewed by palmer.