Merge branch 'master' of /afs/megacz.com/web/research.cs.berkeley.edu/project/sbp...
authorAdam Megacz <megacz@cs.berkeley.edu>
Sun, 2 May 2010 01:24:14 +0000 (18:24 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Sun, 2 May 2010 01:24:14 +0000 (18:24 -0700)

Trivial merge