From 7f04b6ce59df80e8362466aba37319d8762c8d07 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Mon, 9 Feb 2004 00:32:21 -0800
Subject: [PATCH] bk resolve is making me commit these even though they're
 broken.

--HG--
extra : convert_revision : 87b2c4a4a83eec7d696d9d84d14dbdc7532849f9