From: Justin Seyster <jseyster@cs.sunysb.edu>
Date: Fri, 3 Sep 2010 22:32:08 +0000 (-0400)
Subject: Merge branch 'master' into autoheaders
X-Git-Tag: release-v1.0~48^2~9
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=9b6c88392ba7a1e2f8fdaeb617c11910e19b072b;p=interaspect.git

Merge branch 'master' into autoheaders
---

9b6c88392ba7a1e2f8fdaeb617c11910e19b072b