Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 18 Aug 2009 05:39:10 +0000 (22:39 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 18 Aug 2009 05:39:10 +0000 (22:39 -0700)
commita1ea10d7bac34f022598f82873723e2dfee58625
tree0c947f5b98bf86165e37c4cb9ff7c540eb0aaf5b
parent70251bbb1a71f9debc2ac5137cc6ae84f58fa962
parentc438b2e431066d9324238e1c678ef68a3b721f33
Merge with head.