merged in changes with packge information
author<mako@atdot.cc> <>
Sat, 28 Jul 2007 18:57:27 +0000 (14:57 -0400)
committer<mako@atdot.cc> <>
Sat, 28 Jul 2007 18:57:27 +0000 (14:57 -0400)
1  2 
text.tex

diff --cc text.tex
Simple merge

Benjamin Mako Hill || Want to submit a patch?