Merge commit 'origin/master'
authorW. Trevor King <wking@drexel.edu>
Fri, 1 Apr 2011 00:16:47 +0000 (17:16 -0700)
committerW. Trevor King <wking@drexel.edu>
Fri, 1 Apr 2011 00:16:47 +0000 (17:16 -0700)

Trivial merge