Merge remote branch 'pschumms/master'
authorW. Trevor King <wking@drexel.edu>
Thu, 8 Sep 2011 02:33:51 +0000 (22:33 -0400)
committerW. Trevor King <wking@drexel.edu>
Thu, 8 Sep 2011 02:33:51 +0000 (22:33 -0400)

Trivial merge