From 6fa5c7af9528a2f542fb791e808ea3618ec1114b Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sun, 19 Nov 2006 18:38:12 -0500
Subject: [PATCH] Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem into 
 zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : c2b7784377d85df5b8ee39c891cd3da9907410d8