Merge remote branch 'public/master'
authorW. Trevor King <wking@drexel.edu>
Tue, 9 Nov 2010 15:36:44 +0000 (10:36 -0500)
committerW. Trevor King <wking@drexel.edu>
Tue, 9 Nov 2010 15:36:44 +0000 (10:36 -0500)

Trivial merge