Merge from W. Trevor King's tree.
authorW. Trevor King <wking@drexel.edu>
Mon, 24 Nov 2008 23:29:16 +0000 (18:29 -0500)
committerW. Trevor King <wking@drexel.edu>
Mon, 24 Nov 2008 23:29:16 +0000 (18:29 -0500)

Trivial merge