merge
authorAdam Megacz <megacz@cs.berkeley.edu>
Sun, 5 Jun 2011 21:03:47 +0000 (14:03 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Sun, 5 Jun 2011 21:03:47 +0000 (14:03 -0700)

Trivial merge