From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Mon, 22 Sep 2008 18:30:53 +0000 (-0500)
Subject: Merge /home/palacios/palacios
X-Git-Tag: 1.0~24
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=2f76b78cb58f366bcfc63a63263d83d5bc079377;p=palacios.releases.git

Merge /home/palacios/palacios

Conflicts:
	CODING_GUIDELINES
---

2f76b78cb58f366bcfc63a63263d83d5bc079377