merge
authorDerek Hower <drh5@cs.wisc.edu>
Fri, 11 Sep 2009 21:23:17 +0000 (16:23 -0500)
committerDerek Hower <drh5@cs.wisc.edu>
Fri, 11 Sep 2009 21:23:17 +0000 (16:23 -0500)

Trivial merge