Merge branch 'autoheaders'
authorJustin Seyster <jseyster@cs.sunysb.edu>
Wed, 8 Sep 2010 00:47:18 +0000 (20:47 -0400)
committerJustin Seyster <jseyster@cs.sunysb.edu>
Wed, 8 Sep 2010 00:47:18 +0000 (20:47 -0400)

Trivial merge