Merge branch 'master' into autoheaders
authorJustin Seyster <jseyster@cs.sunysb.edu>
Fri, 3 Sep 2010 22:32:08 +0000 (18:32 -0400)
committerJustin Seyster <jseyster@cs.sunysb.edu>
Fri, 3 Sep 2010 22:32:08 +0000 (18:32 -0400)

Trivial merge