Merge remote branch 'matclab/master'
authorW. Trevor King <wking@drexel.edu>
Wed, 14 Jul 2010 23:31:15 +0000 (19:31 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 14 Jul 2010 23:31:15 +0000 (19:31 -0400)

Trivial merge