Merge from main branch
authorW. Trevor King <wking@drexel.edu>
Thu, 13 Nov 2008 18:47:33 +0000 (13:47 -0500)
committerW. Trevor King <wking@drexel.edu>
Thu, 13 Nov 2008 18:47:33 +0000 (13:47 -0500)

Trivial merge