merge
authorDerek Hower <drh5@cs.wisc.edu>
Tue, 25 Aug 2009 15:37:21 +0000 (10:37 -0500)
committerDerek Hower <drh5@cs.wisc.edu>
Tue, 25 Aug 2009 15:37:21 +0000 (10:37 -0500)

Trivial merge