Merge branch 'workspace'
authorJustin Seyster <jseyster@cs.sunysb.edu>
Fri, 13 Aug 2010 22:50:17 +0000 (18:50 -0400)
committerJustin Seyster <jseyster@cs.sunysb.edu>
Fri, 13 Aug 2010 22:50:17 +0000 (18:50 -0400)

Trivial merge