Merge tag 'smteval2013'
authorMorgan Deters <mdeters@cs.nyu.edu>
Wed, 8 May 2013 22:13:30 +0000 (18:13 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Wed, 8 May 2013 22:13:30 +0000 (18:13 -0400)

Trivial merge