-
Committer:
Robey Pointer
-
Date:
2007-09-04 17:00:45 UTC
-
mto:
(140.2.1 merge-robey)
-
mto:
This revision was merged to the branch mainline in
revision
142.
-
Revision ID:
robey@lag.net-20070904170045-j510qks9nzynpyn4
fix bugs introduced by incorrectly resolving the previous conflicts.  (i
missed an important change last time.)  things should work better now.