fix some weird cruft from the branch merge

Author nanotube <nanotube>
Author date 2008-03-19 22:31:42
Author local date 2008-03-19 22:31:42 +0000
Committer nanotube <nanotube>
Committer date 2008-03-19 22:31:42
Committer local date 2008-03-19 22:31:42 +0000
Commit b9ab12cdb65b798cfeee76d159b3b725661cbad7
Tree 9ff5a94d501c87d34b1cfc287a25dd485f3b09e9
Parent 5cd57df1fee3514f648d417abff99bc15b14080b
fix some weird cruft from the branch merge
ViewGit