From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Wed, 24 Sep 2008 23:05:06 +0000 (-0500)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Tag: 1.0~10^2
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=a01f6fd0fbf4b990cb72c39039904f79beed69f2;p=palacios-OLD.git

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel

Conflicts:
	CODING_GUIDELINES
---

a01f6fd0fbf4b990cb72c39039904f79beed69f2