Merge Gabe's changes with mine.
authorSteve Reinhardt <stever@eecs.umich.edu>
Sun, 22 Jul 2007 14:40:45 +0000 (10:40 -0400)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sun, 22 Jul 2007 14:40:45 +0000 (10:40 -0400)
--HG--
extra : convert_revision : f50ed42e7acb3f11e610fd6976eaa8df0c6ba2ab

1  2 
SConstruct

diff --cc SConstruct
Simple merge