Merge remote branch 'gour/master'
authorW. Trevor King <wking@drexel.edu>
Fri, 25 Jun 2010 18:53:41 +0000 (14:53 -0400)
committerW. Trevor King <wking@drexel.edu>
Fri, 25 Jun 2010 18:53:41 +0000 (14:53 -0400)

Trivial merge