Non-event merge with trunk, just to pull in that bit of history
authorW. Trevor King <wking@drexel.edu>
Mon, 19 Oct 2009 19:51:34 +0000 (15:51 -0400)
committerW. Trevor King <wking@drexel.edu>
Mon, 19 Oct 2009 19:51:34 +0000 (15:51 -0400)

Trivial merge