Merge remote branch 'origin/master'
authorW. Trevor King <wking@drexel.edu>
Sat, 26 Jun 2010 10:35:31 +0000 (06:35 -0400)
committerW. Trevor King <wking@drexel.edu>
Sat, 26 Jun 2010 10:35:31 +0000 (06:35 -0400)

Trivial merge