merge
authorDerek Hower <drh5@cs.wisc.edu>
Mon, 20 Jul 2009 14:41:28 +0000 (09:41 -0500)
committerDerek Hower <drh5@cs.wisc.edu>
Mon, 20 Jul 2009 14:41:28 +0000 (09:41 -0500)

Trivial merge