Merge remote branch 'public/master'
authorW. Trevor King <wking@drexel.edu>
Thu, 13 Jan 2011 13:16:28 +0000 (08:16 -0500)
committerW. Trevor King <wking@drexel.edu>
Thu, 13 Jan 2011 13:16:28 +0000 (08:16 -0500)

Trivial merge