merge
authorDerek Hower <drh5@cs.wisc.edu>
Wed, 7 Oct 2009 20:48:26 +0000 (15:48 -0500)
committerDerek Hower <drh5@cs.wisc.edu>
Wed, 7 Oct 2009 20:48:26 +0000 (15:48 -0500)

Trivial merge