From d7ad8d95472a81d922ab9e517c95bcbd389f8418 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eric@boostpro.com>
Date: Mon, 14 Apr 2008 05:45:24 +0000
Subject: [PATCH] really screwy merge trancking behavior, starting over

[SVN r44394]