Merged from main branch. I like my version better ;).
authorW. Trevor King <wking@drexel.edu>
Wed, 24 Jun 2009 21:58:41 +0000 (17:58 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 24 Jun 2009 21:58:41 +0000 (17:58 -0400)

Trivial merge