From 9e2c689059cd674e4517294c8fbf81c91385a380 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]