Merge branch 'master' into workspace
authorJustin Seyster <jseyster@cs.sunysb.edu>
Thu, 8 Jul 2010 19:27:44 +0000 (15:27 -0400)
committerJustin Seyster <jseyster@cs.sunysb.edu>
Thu, 8 Jul 2010 19:27:44 +0000 (15:27 -0400)

Trivial merge