From 08501b5a352ed82d1563a2529cdba17807dae1c5 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 22 Jan 2007 23:38:17 -0800
Subject: [PATCH] Fix for slightly garbled hand merge

--HG--
extra : convert_revision : f9be59e94311571d91b6793b1caa1b6136ef864c