Merge remote branch 'tanguy/master'
authorW. Trevor King <wking@drexel.edu>
Thu, 8 Sep 2011 03:15:25 +0000 (23:15 -0400)
committerW. Trevor King <wking@drexel.edu>
Thu, 8 Sep 2011 03:15:25 +0000 (23:15 -0400)

Trivial merge