From 74ae8bc0bb2a085ed413da2924b75ff5cadd262f Mon Sep 17 00:00:00 2001
From: Deadmoose <karma@deadmoose.com>
Date: Tue, 5 Apr 2011 15:49:23 -0700
Subject: [PATCH] No $Id$ in git. And update some stale copyright while I'm at
 it.

---
 lib/SOURCE_HEADER                                             | 2 --
 src/main/java/com/samskivert/Log.java                         | 2 --
 src/main/java/com/samskivert/annotation/ReplacedBy.java       | 2 --
 src/main/java/com/samskivert/io/ByteArrayOutInputStream.java  | 2 --
 src/main/java/com/samskivert/io/ExtensiblePrintStream.java    | 2 --
 src/main/java/com/samskivert/io/PersistenceException.java     | 2 --
 src/main/java/com/samskivert/io/StreamUtil.java               | 2 --
 src/main/java/com/samskivert/io/package.html                  | 4 +---
 src/main/java/com/samskivert/jdbc/AutoCloseOperation.java     | 2 --
 src/main/java/com/samskivert/jdbc/BaseLiaison.java            | 2 --
 src/main/java/com/samskivert/jdbc/ColumnDefinition.java       | 2 --
 src/main/java/com/samskivert/jdbc/ConnectionProvider.java     | 2 --
 .../com/samskivert/jdbc/DataSourceConnectionProvider.java     | 2 --
 src/main/java/com/samskivert/jdbc/DatabaseLiaison.java        | 2 --
 src/main/java/com/samskivert/jdbc/DefaultLiaison.java         | 2 --
 src/main/java/com/samskivert/jdbc/HsqldbLiaison.java          | 2 --
 src/main/java/com/samskivert/jdbc/JDBCUtil.java               | 2 --
 src/main/java/com/samskivert/jdbc/JORARepository.java         | 2 --
 src/main/java/com/samskivert/jdbc/LiaisonRegistry.java        | 2 --
 src/main/java/com/samskivert/jdbc/MySQLLiaison.java           | 2 --
 src/main/java/com/samskivert/jdbc/PostgreSQLLiaison.java      | 2 --
 src/main/java/com/samskivert/jdbc/Repository.java             | 2 --
 src/main/java/com/samskivert/jdbc/RepositoryListenerUnit.java | 2 --
 src/main/java/com/samskivert/jdbc/RepositoryUnit.java         | 2 --
 src/main/java/com/samskivert/jdbc/ResultUnit.java             | 2 --
 src/main/java/com/samskivert/jdbc/SimpleRepository.java       | 2 --
 .../java/com/samskivert/jdbc/StaticConnectionProvider.java    | 2 --
 src/main/java/com/samskivert/jdbc/TransitionRepository.java   | 2 --
 src/main/java/com/samskivert/jdbc/WriteOnlyUnit.java          | 2 --
 src/main/java/com/samskivert/jdbc/jora/Cursor.java            | 2 --
 src/main/java/com/samskivert/jdbc/jora/DataTransferError.java | 2 --
 src/main/java/com/samskivert/jdbc/jora/FieldDescriptor.java   | 2 --
 src/main/java/com/samskivert/jdbc/jora/FieldMask.java         | 2 --
 src/main/java/com/samskivert/jdbc/jora/README                 | 2 --
 src/main/java/com/samskivert/jdbc/jora/Table.java             | 2 --
 src/main/java/com/samskivert/jdbc/jora/package.html           | 4 +---
 src/main/java/com/samskivert/jdbc/package.html                | 4 +---
 src/main/java/com/samskivert/net/AddressUtil.java             | 2 --
 src/main/java/com/samskivert/net/AttachableURLFactory.java    | 2 --
 src/main/java/com/samskivert/net/HttpPostUtil.java            | 2 --
 src/main/java/com/samskivert/net/MACUtil.java                 | 2 --
 src/main/java/com/samskivert/net/MailUtil.java                | 2 --
 src/main/java/com/samskivert/net/PathUtil.java                | 2 --
 src/main/java/com/samskivert/net/cddb/CDDB.java               | 2 --
 src/main/java/com/samskivert/net/cddb/CDDBException.java      | 2 --
 src/main/java/com/samskivert/net/cddb/CDDBProtocol.java       | 2 --
 src/main/java/com/samskivert/net/cddb/CDDBTest.java           | 2 --
 src/main/java/com/samskivert/net/cddb/package.html            | 4 +---
 src/main/java/com/samskivert/net/package.html                 | 4 +---
 src/main/java/com/samskivert/package.html                     | 4 +---
 src/main/java/com/samskivert/servlet/HttpErrorException.java  | 2 --
 .../com/samskivert/servlet/IndiscriminateSiteIdentifier.java  | 2 --
 .../java/com/samskivert/servlet/JDBCTableSiteIdentifier.java  | 2 --
 src/main/java/com/samskivert/servlet/MessageManager.java      | 2 --
 src/main/java/com/samskivert/servlet/RedirectException.java   | 2 --
 src/main/java/com/samskivert/servlet/Site.java                | 2 --
 src/main/java/com/samskivert/servlet/SiteIdentifier.java      | 2 --
 src/main/java/com/samskivert/servlet/SiteResourceLoader.java  | 2 --
 src/main/java/com/samskivert/servlet/package.html             | 4 +---
 .../servlet/user/AuthenticationFailedException.java           | 2 --
 src/main/java/com/samskivert/servlet/user/Authenticator.java  | 2 --
 .../com/samskivert/servlet/user/InvalidPasswordException.java | 2 --
 .../com/samskivert/servlet/user/InvalidUsernameException.java | 2 --
 .../java/com/samskivert/servlet/user/NoSuchUserException.java | 2 --
 src/main/java/com/samskivert/servlet/user/Password.java       | 2 --
 src/main/java/com/samskivert/servlet/user/User.java           | 2 --
 .../java/com/samskivert/servlet/user/UserExistsException.java | 2 --
 src/main/java/com/samskivert/servlet/user/UserManager.java    | 2 --
 src/main/java/com/samskivert/servlet/user/UserRepository.java | 2 --
 src/main/java/com/samskivert/servlet/user/UserUtil.java       | 2 --
 src/main/java/com/samskivert/servlet/user/Username.java       | 2 --
 src/main/java/com/samskivert/servlet/user/package.html        | 4 +---
 src/main/java/com/samskivert/servlet/util/CookieUtil.java     | 2 --
 .../com/samskivert/servlet/util/DataValidationException.java  | 2 --
 src/main/java/com/samskivert/servlet/util/ExceptionMap.java   | 2 --
 .../java/com/samskivert/servlet/util/FriendlyException.java   | 2 --
 src/main/java/com/samskivert/servlet/util/HTMLUtil.java       | 2 --
 src/main/java/com/samskivert/servlet/util/ParameterUtil.java  | 2 --
 src/main/java/com/samskivert/servlet/util/RequestUtils.java   | 2 --
 src/main/java/com/samskivert/servlet/util/ServiceWaiter.java  | 2 --
 src/main/java/com/samskivert/servlet/util/package.html        | 4 +---
 src/main/java/com/samskivert/swing/AWTResultListener.java     | 2 --
 src/main/java/com/samskivert/swing/AbsoluteLayout.java        | 2 --
 src/main/java/com/samskivert/swing/CollapsibleList.java       | 2 --
 src/main/java/com/samskivert/swing/CollapsiblePanel.java      | 2 --
 src/main/java/com/samskivert/swing/ComboButtonBox.java        | 2 --
 src/main/java/com/samskivert/swing/CommandButton.java         | 2 --
 src/main/java/com/samskivert/swing/ControlledPanel.java       | 2 --
 src/main/java/com/samskivert/swing/Controller.java            | 2 --
 src/main/java/com/samskivert/swing/ControllerProvider.java    | 2 --
 src/main/java/com/samskivert/swing/DimenInfo.java             | 2 --
 src/main/java/com/samskivert/swing/DimmedIcon.java            | 2 --
 src/main/java/com/samskivert/swing/EnablingAdapter.java       | 2 --
 src/main/java/com/samskivert/swing/GroupLayout.java           | 2 --
 src/main/java/com/samskivert/swing/GroupLayoutTest.java       | 2 --
 src/main/java/com/samskivert/swing/HGroupLayout.java          | 2 --
 src/main/java/com/samskivert/swing/IntField.java              | 2 --
 .../java/com/samskivert/swing/IntegerTableCellRenderer.java   | 2 --
 src/main/java/com/samskivert/swing/JInternalDialog.java       | 2 --
 src/main/java/com/samskivert/swing/Label.java                 | 2 --
 src/main/java/com/samskivert/swing/LabelSausage.java          | 2 --
 src/main/java/com/samskivert/swing/LabelStyleConstants.java   | 2 --
 src/main/java/com/samskivert/swing/LazyComponent.java         | 2 --
 src/main/java/com/samskivert/swing/MultiLineLabel.java        | 2 --
 src/main/java/com/samskivert/swing/ObjectEditorTable.java     | 2 --
 src/main/java/com/samskivert/swing/RadialLabelSausage.java    | 2 --
 src/main/java/com/samskivert/swing/RadialMenu.java            | 2 --
 src/main/java/com/samskivert/swing/RadialMenuItem.java        | 2 --
 src/main/java/com/samskivert/swing/RuntimeAdjust.java         | 2 --
 src/main/java/com/samskivert/swing/SafeLayeredPane.java       | 2 --
 src/main/java/com/samskivert/swing/ScaledIcon.java            | 2 --
 src/main/java/com/samskivert/swing/ScrollBox.java             | 2 --
 src/main/java/com/samskivert/swing/ScrollablePanel.java       | 2 --
 src/main/java/com/samskivert/swing/ShapeIcon.java             | 2 --
 src/main/java/com/samskivert/swing/SimpleSlider.java          | 2 --
 src/main/java/com/samskivert/swing/SmartPolygon.java          | 2 --
 src/main/java/com/samskivert/swing/Spacer.java                | 2 --
 src/main/java/com/samskivert/swing/TGraphics2D.java           | 2 --
 src/main/java/com/samskivert/swing/TableMap.java              | 2 --
 src/main/java/com/samskivert/swing/TableSorter.java           | 2 --
 src/main/java/com/samskivert/swing/Timer.java                 | 2 --
 src/main/java/com/samskivert/swing/VGroupLayout.java          | 2 --
 .../com/samskivert/swing/dnd/AutoscrollingDropTarget.java     | 2 --
 src/main/java/com/samskivert/swing/dnd/DnDManager.java        | 2 --
 src/main/java/com/samskivert/swing/dnd/DragSource.java        | 2 --
 src/main/java/com/samskivert/swing/dnd/DropTarget.java        | 2 --
 src/main/java/com/samskivert/swing/dnd/package.html           | 4 +---
 src/main/java/com/samskivert/swing/event/AncestorAdapter.java | 2 --
 src/main/java/com/samskivert/swing/event/CommandEvent.java    | 2 --
 src/main/java/com/samskivert/swing/event/DocumentAdapter.java | 2 --
 .../java/com/samskivert/swing/event/MouseArmingAdapter.java   | 2 --
 .../java/com/samskivert/swing/event/PopupMenuAdapter.java     | 2 --
 src/main/java/com/samskivert/swing/event/package.html         | 4 +---
 src/main/java/com/samskivert/swing/package.html               | 4 +---
 src/main/java/com/samskivert/swing/util/ButtonUtil.java       | 2 --
 src/main/java/com/samskivert/swing/util/DialogUtil.java       | 2 --
 src/main/java/com/samskivert/swing/util/MenuUtil.java         | 2 --
 src/main/java/com/samskivert/swing/util/MouseHijacker.java    | 2 --
 src/main/java/com/samskivert/swing/util/ProximityTracker.java | 2 --
 src/main/java/com/samskivert/swing/util/RetryableTask.java    | 2 --
 src/main/java/com/samskivert/swing/util/SwingUtil.java        | 2 --
 src/main/java/com/samskivert/swing/util/Task.java             | 2 --
 src/main/java/com/samskivert/swing/util/TaskAdapter.java      | 2 --
 src/main/java/com/samskivert/swing/util/TaskMaster.java       | 2 --
 src/main/java/com/samskivert/swing/util/TaskObserver.java     | 2 --
 src/main/java/com/samskivert/swing/util/package.html          | 4 +---
 src/main/java/com/samskivert/test/TestUtil.java               | 2 --
 src/main/java/com/samskivert/test/package.html                | 4 +---
 src/main/java/com/samskivert/text/MessageUtil.java            | 2 --
 src/main/java/com/samskivert/text/package.html                | 4 +---
 src/main/java/com/samskivert/util/AbstractIntSet.java         | 2 --
 src/main/java/com/samskivert/util/AbstractInterator.java      | 2 --
 src/main/java/com/samskivert/util/ArrayIntSet.java            | 2 --
 src/main/java/com/samskivert/util/ArrayUtil.java              | 2 --
 src/main/java/com/samskivert/util/AuditLogger.java            | 2 --
 src/main/java/com/samskivert/util/BaseArrayList.java          | 2 --
 src/main/java/com/samskivert/util/BasicRunQueue.java          | 2 --
 src/main/java/com/samskivert/util/ByteEnum.java               | 2 --
 src/main/java/com/samskivert/util/ByteEnumUtil.java           | 2 --
 src/main/java/com/samskivert/util/CalendarUtil.java           | 2 --
 src/main/java/com/samskivert/util/Calendars.java              | 2 --
 src/main/java/com/samskivert/util/Callables.java              | 2 --
 src/main/java/com/samskivert/util/ChainedResultListener.java  | 2 --
 src/main/java/com/samskivert/util/CheapIntMap.java            | 2 --
 src/main/java/com/samskivert/util/ClassUtil.java              | 2 --
 src/main/java/com/samskivert/util/CollectionUtil.java         | 2 --
 src/main/java/com/samskivert/util/Collections.java            | 2 --
 src/main/java/com/samskivert/util/CompactIntListUtil.java     | 2 --
 src/main/java/com/samskivert/util/ComparableArrayList.java    | 2 --
 src/main/java/com/samskivert/util/ComparableTuple.java        | 2 --
 src/main/java/com/samskivert/util/Comparators.java            | 2 --
 src/main/java/com/samskivert/util/ComplainingListener.java    | 2 --
 src/main/java/com/samskivert/util/Config.java                 | 2 --
 src/main/java/com/samskivert/util/ConfigUtil.java             | 2 --
 src/main/java/com/samskivert/util/CountHashMap.java           | 2 --
 src/main/java/com/samskivert/util/CountMap.java               | 2 --
 src/main/java/com/samskivert/util/Crypt.java                  | 2 --
 src/main/java/com/samskivert/util/CurrencyUtil.java           | 2 --
 src/main/java/com/samskivert/util/DebugChords.java            | 2 --
 src/main/java/com/samskivert/util/DefaultLogProvider.java     | 2 --
 src/main/java/com/samskivert/util/DependencyGraph.java        | 2 --
 src/main/java/com/samskivert/util/ExpiringReference.java      | 2 --
 src/main/java/com/samskivert/util/FailureListener.java        | 2 --
 src/main/java/com/samskivert/util/FileUtil.java               | 2 --
 src/main/java/com/samskivert/util/Folds.java                  | 2 --
 src/main/java/com/samskivert/util/FormatterUtil.java          | 2 --
 src/main/java/com/samskivert/util/GenUtil.java                | 2 --
 src/main/java/com/samskivert/util/HashIntMap.java             | 2 --
 src/main/java/com/samskivert/util/HashIntSet.java             | 2 --
 src/main/java/com/samskivert/util/Histogram.java              | 2 --
 src/main/java/com/samskivert/util/IntIntMap.java              | 2 --
 src/main/java/com/samskivert/util/IntListUtil.java            | 2 --
 src/main/java/com/samskivert/util/IntMap.java                 | 2 --
 src/main/java/com/samskivert/util/IntMaps.java                | 2 --
 src/main/java/com/samskivert/util/IntResultListener.java      | 2 --
 src/main/java/com/samskivert/util/IntSet.java                 | 2 --
 src/main/java/com/samskivert/util/IntSets.java                | 2 --
 src/main/java/com/samskivert/util/IntTuple.java               | 2 --
 src/main/java/com/samskivert/util/Interable.java              | 2 --
 src/main/java/com/samskivert/util/Interator.java              | 2 --
 src/main/java/com/samskivert/util/Interval.java               | 2 --
 src/main/java/com/samskivert/util/Invoker.java                | 2 --
 src/main/java/com/samskivert/util/JDK14Logger.java            | 2 --
 src/main/java/com/samskivert/util/KeyUtil.java                | 2 --
 src/main/java/com/samskivert/util/KeyValue.java               | 2 --
 src/main/java/com/samskivert/util/LRUHashMap.java             | 2 --
 src/main/java/com/samskivert/util/Lifecycle.java              | 2 --
 src/main/java/com/samskivert/util/ListUtil.java               | 2 --
 src/main/java/com/samskivert/util/Log.java                    | 2 --
 src/main/java/com/samskivert/util/Log4JLogger.java            | 2 --
 src/main/java/com/samskivert/util/LogBuilder.java             | 2 --
 src/main/java/com/samskivert/util/LogProvider.java            | 2 --
 src/main/java/com/samskivert/util/Logger.java                 | 2 --
 src/main/java/com/samskivert/util/LoggingLogProvider.java     | 2 --
 src/main/java/com/samskivert/util/LoopingThread.java          | 2 --
 src/main/java/com/samskivert/util/MapEntry.java               | 2 --
 src/main/java/com/samskivert/util/Mapping.java                | 2 --
 src/main/java/com/samskivert/util/MethodFinder.java           | 2 --
 .../java/com/samskivert/util/MissingPropertyException.java    | 2 --
 src/main/java/com/samskivert/util/Multex.java                 | 2 --
 src/main/java/com/samskivert/util/ObjectUtil.java             | 2 --
 src/main/java/com/samskivert/util/ObserverList.java           | 2 --
 src/main/java/com/samskivert/util/OneLineLogFormatter.java    | 2 --
 src/main/java/com/samskivert/util/Predicate.java              | 2 --
 src/main/java/com/samskivert/util/PrefsConfig.java            | 2 --
 src/main/java/com/samskivert/util/ProcessLogger.java          | 2 --
 src/main/java/com/samskivert/util/PropertiesUtil.java         | 2 --
 src/main/java/com/samskivert/util/Queue.java                  | 2 --
 src/main/java/com/samskivert/util/QuickSort.java              | 2 --
 src/main/java/com/samskivert/util/RandomUtil.java             | 2 --
 src/main/java/com/samskivert/util/Randoms.java                | 2 --
 src/main/java/com/samskivert/util/RecentList.java             | 2 --
 src/main/java/com/samskivert/util/RepeatCallTracker.java      | 2 --
 src/main/java/com/samskivert/util/RepeatRecordFilter.java     | 2 --
 src/main/java/com/samskivert/util/ResultHandler.java          | 2 --
 src/main/java/com/samskivert/util/ResultListener.java         | 2 --
 src/main/java/com/samskivert/util/ResultListenerList.java     | 2 --
 src/main/java/com/samskivert/util/RunAnywhere.java            | 2 --
 src/main/java/com/samskivert/util/RunQueue.java               | 2 --
 src/main/java/com/samskivert/util/Runnables.java              | 2 --
 src/main/java/com/samskivert/util/SerialExecutor.java         | 2 --
 .../java/com/samskivert/util/ServiceUnavailableException.java | 2 --
 src/main/java/com/samskivert/util/ServiceWaiter.java          | 2 --
 src/main/java/com/samskivert/util/ShortestPath.java           | 2 --
 src/main/java/com/samskivert/util/SignalUtil.java             | 2 --
 src/main/java/com/samskivert/util/SoftCache.java              | 2 --
 src/main/java/com/samskivert/util/SortableArrayList.java      | 2 --
 src/main/java/com/samskivert/util/StringUtil.java             | 2 --
 src/main/java/com/samskivert/util/SystemInfo.java             | 2 --
 src/main/java/com/samskivert/util/TermUtil.java               | 2 --
 src/main/java/com/samskivert/util/TerseLogFormatter.java      | 2 --
 src/main/java/com/samskivert/util/Throttle.java               | 2 --
 src/main/java/com/samskivert/util/Triple.java                 | 2 --
 src/main/java/com/samskivert/util/Tuple.java                  | 2 --
 src/main/java/com/samskivert/util/ValueMarshaller.java        | 2 --
 src/main/java/com/samskivert/util/WeakObserverList.java       | 2 --
 src/main/java/com/samskivert/util/package.html                | 4 +---
 src/main/java/com/samskivert/velocity/Application.java        | 2 --
 .../java/com/samskivert/velocity/ClasspathResourceLoader.java | 2 --
 src/main/java/com/samskivert/velocity/CurrencyTool.java       | 2 --
 src/main/java/com/samskivert/velocity/DataTool.java           | 2 --
 src/main/java/com/samskivert/velocity/DispatcherServlet.java  | 2 --
 src/main/java/com/samskivert/velocity/DummyLogic.java         | 2 --
 src/main/java/com/samskivert/velocity/FormTool.java           | 2 --
 src/main/java/com/samskivert/velocity/I18nTool.java           | 2 --
 src/main/java/com/samskivert/velocity/ImportDirective.java    | 2 --
 src/main/java/com/samskivert/velocity/InvocationContext.java  | 2 --
 src/main/java/com/samskivert/velocity/Logic.java              | 2 --
 .../java/com/samskivert/velocity/ServletContextLogger.java    | 2 --
 .../com/samskivert/velocity/ServletContextResourceLoader.java | 2 --
 .../samskivert/velocity/ServletContextResourceManager.java    | 2 --
 .../java/com/samskivert/velocity/SiteJarResourceLoader.java   | 2 --
 src/main/java/com/samskivert/velocity/SiteKey.java            | 2 --
 .../java/com/samskivert/velocity/SiteResourceManager.java     | 2 --
 src/main/java/com/samskivert/velocity/StringTool.java         | 2 --
 src/main/java/com/samskivert/velocity/VelocityUtil.java       | 2 --
 src/main/java/com/samskivert/velocity/package.html            | 4 +---
 src/main/java/com/samskivert/xml/CallMethodSpecialRule.java   | 2 --
 src/main/java/com/samskivert/xml/CheckVersionRule.java        | 2 --
 src/main/java/com/samskivert/xml/SetFieldRule.java            | 2 --
 src/main/java/com/samskivert/xml/SetNextFieldRule.java        | 2 --
 src/main/java/com/samskivert/xml/SetPropertyFieldsRule.java   | 2 --
 src/main/java/com/samskivert/xml/SimpleParser.java            | 2 --
 src/main/java/com/samskivert/xml/ValidatedSetNextRule.java    | 2 --
 src/main/java/com/samskivert/xml/XMLUtil.java                 | 2 --
 src/main/java/com/samskivert/xml/package.html                 | 4 +---
 src/main/javadoc/overview.html                                | 4 +---
 src/main/resources/com/samskivert/Utils.gwt.xml               | 1 -
 src/main/sql/create_site_tables.mysql                         | 2 --
 src/main/sql/create_user_tables.mysql                         | 2 --
 src/test/java/com/samskivert/io/StreamUtilTest.java           | 2 --
 src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java      | 2 --
 .../java/com/samskivert/servlet/SiteResourceLoaderTest.java   | 2 --
 src/test/java/com/samskivert/swing/AdjustTestApp.java         | 2 --
 src/test/java/com/samskivert/swing/LabelDemo.java             | 2 --
 src/test/java/com/samskivert/swing/ProximityTrackerTest.java  | 2 --
 src/test/java/com/samskivert/swing/TestComboButtonBox.java    | 2 --
 src/test/java/com/samskivert/util/ArrayIntSetTest.java        | 2 --
 src/test/java/com/samskivert/util/ArrayUtilTest.java          | 2 --
 src/test/java/com/samskivert/util/CheapIntMapTest.java        | 2 --
 src/test/java/com/samskivert/util/CollectionUtilTest.java     | 2 --
 src/test/java/com/samskivert/util/ConfigTest.java             | 2 --
 src/test/java/com/samskivert/util/ConfigUtilTest.java         | 2 --
 src/test/java/com/samskivert/util/FoldsTest.java              | 2 --
 src/test/java/com/samskivert/util/HashIntMapTest.java         | 2 --
 src/test/java/com/samskivert/util/HashIntSetTest.java         | 2 --
 src/test/java/com/samskivert/util/IntListUtilTest.java        | 2 --
 src/test/java/com/samskivert/util/IntSetTestBase.java         | 2 --
 src/test/java/com/samskivert/util/LRUHashMapTest.java         | 2 --
 src/test/java/com/samskivert/util/ObserverListTest.java       | 2 --
 src/test/java/com/samskivert/util/QuickSortTest.java          | 2 --
 src/test/java/com/samskivert/util/RunnablesTest.java          | 2 --
 src/test/java/com/samskivert/util/SerialExecutorTest.java     | 2 --
 src/test/java/com/samskivert/util/StringUtilTest.java         | 2 --
 src/test/java/com/samskivert/util/SystemInfoDemo.java         | 2 --
 src/test/java/com/samskivert/util/ThrottleTest.java           | 2 --
 src/test/java/com/samskivert/velocity/VelocityTest.java       | 2 --
 src/test/java/com/samskivert/xml/SetFieldRuleTest.java        | 2 --
 src/test/resources/util/child.properties                      | 2 --
 src/test/resources/util/grandparent.properties                | 2 --
 src/test/resources/util/parent.properties                     | 2 --
 src/test/resources/util/test.properties                       | 2 --
 322 files changed, 19 insertions(+), 662 deletions(-)

diff --git a/lib/SOURCE_HEADER b/lib/SOURCE_HEADER
index 795b8c99..b8064d6e 100644
--- a/lib/SOURCE_HEADER
+++ b/lib/SOURCE_HEADER
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/Log.java b/src/main/java/com/samskivert/Log.java
index eef5db89..78f88048 100644
--- a/src/main/java/com/samskivert/Log.java
+++ b/src/main/java/com/samskivert/Log.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/annotation/ReplacedBy.java b/src/main/java/com/samskivert/annotation/ReplacedBy.java
index 2a823037..c47bc1ee 100644
--- a/src/main/java/com/samskivert/annotation/ReplacedBy.java
+++ b/src/main/java/com/samskivert/annotation/ReplacedBy.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java b/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java
index f2ae5ef7..4d921fc8 100644
--- a/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java
+++ b/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/io/ExtensiblePrintStream.java b/src/main/java/com/samskivert/io/ExtensiblePrintStream.java
index 7fb96c66..23188dda 100644
--- a/src/main/java/com/samskivert/io/ExtensiblePrintStream.java
+++ b/src/main/java/com/samskivert/io/ExtensiblePrintStream.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/io/PersistenceException.java b/src/main/java/com/samskivert/io/PersistenceException.java
index 006523c2..97f5ed74 100644
--- a/src/main/java/com/samskivert/io/PersistenceException.java
+++ b/src/main/java/com/samskivert/io/PersistenceException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/io/StreamUtil.java b/src/main/java/com/samskivert/io/StreamUtil.java
index 632b8aab..fbe992d5 100644
--- a/src/main/java/com/samskivert/io/StreamUtil.java
+++ b/src/main/java/com/samskivert/io/StreamUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/io/package.html b/src/main/java/com/samskivert/io/package.html
index e4a98cb1..e39c5078 100644
--- a/src/main/java/com/samskivert/io/package.html
+++ b/src/main/java/com/samskivert/io/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001-2005 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/jdbc/AutoCloseOperation.java b/src/main/java/com/samskivert/jdbc/AutoCloseOperation.java
index 39eaab53..bee52ebb 100644
--- a/src/main/java/com/samskivert/jdbc/AutoCloseOperation.java
+++ b/src/main/java/com/samskivert/jdbc/AutoCloseOperation.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/BaseLiaison.java b/src/main/java/com/samskivert/jdbc/BaseLiaison.java
index 04bf3353..e91c07c2 100644
--- a/src/main/java/com/samskivert/jdbc/BaseLiaison.java
+++ b/src/main/java/com/samskivert/jdbc/BaseLiaison.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/ColumnDefinition.java b/src/main/java/com/samskivert/jdbc/ColumnDefinition.java
index bbad79a5..1a1ee45f 100644
--- a/src/main/java/com/samskivert/jdbc/ColumnDefinition.java
+++ b/src/main/java/com/samskivert/jdbc/ColumnDefinition.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/ConnectionProvider.java b/src/main/java/com/samskivert/jdbc/ConnectionProvider.java
index 2f2f58ea..35e299fd 100644
--- a/src/main/java/com/samskivert/jdbc/ConnectionProvider.java
+++ b/src/main/java/com/samskivert/jdbc/ConnectionProvider.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java b/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java
index 8bb59f7f..b893838c 100644
--- a/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java
+++ b/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/DatabaseLiaison.java b/src/main/java/com/samskivert/jdbc/DatabaseLiaison.java
index 2b3b9c93..99a90b4b 100644
--- a/src/main/java/com/samskivert/jdbc/DatabaseLiaison.java
+++ b/src/main/java/com/samskivert/jdbc/DatabaseLiaison.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/DefaultLiaison.java b/src/main/java/com/samskivert/jdbc/DefaultLiaison.java
index 54e6ee19..447887de 100644
--- a/src/main/java/com/samskivert/jdbc/DefaultLiaison.java
+++ b/src/main/java/com/samskivert/jdbc/DefaultLiaison.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java b/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java
index c04407d8..4df195dd 100644
--- a/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java
+++ b/src/main/java/com/samskivert/jdbc/HsqldbLiaison.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/JDBCUtil.java b/src/main/java/com/samskivert/jdbc/JDBCUtil.java
index 1b02beac..ad718418 100644
--- a/src/main/java/com/samskivert/jdbc/JDBCUtil.java
+++ b/src/main/java/com/samskivert/jdbc/JDBCUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/JORARepository.java b/src/main/java/com/samskivert/jdbc/JORARepository.java
index a37949d5..d69aa5bb 100644
--- a/src/main/java/com/samskivert/jdbc/JORARepository.java
+++ b/src/main/java/com/samskivert/jdbc/JORARepository.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/LiaisonRegistry.java b/src/main/java/com/samskivert/jdbc/LiaisonRegistry.java
index e5ba6d5c..de6ce582 100644
--- a/src/main/java/com/samskivert/jdbc/LiaisonRegistry.java
+++ b/src/main/java/com/samskivert/jdbc/LiaisonRegistry.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/MySQLLiaison.java b/src/main/java/com/samskivert/jdbc/MySQLLiaison.java
index 176c4c55..559a658e 100644
--- a/src/main/java/com/samskivert/jdbc/MySQLLiaison.java
+++ b/src/main/java/com/samskivert/jdbc/MySQLLiaison.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/PostgreSQLLiaison.java b/src/main/java/com/samskivert/jdbc/PostgreSQLLiaison.java
index 4b11988e..cacf996f 100644
--- a/src/main/java/com/samskivert/jdbc/PostgreSQLLiaison.java
+++ b/src/main/java/com/samskivert/jdbc/PostgreSQLLiaison.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/Repository.java b/src/main/java/com/samskivert/jdbc/Repository.java
index 6108f8d3..dee7c203 100644
--- a/src/main/java/com/samskivert/jdbc/Repository.java
+++ b/src/main/java/com/samskivert/jdbc/Repository.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/RepositoryListenerUnit.java b/src/main/java/com/samskivert/jdbc/RepositoryListenerUnit.java
index 054d63ad..7cc0b102 100644
--- a/src/main/java/com/samskivert/jdbc/RepositoryListenerUnit.java
+++ b/src/main/java/com/samskivert/jdbc/RepositoryListenerUnit.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/RepositoryUnit.java b/src/main/java/com/samskivert/jdbc/RepositoryUnit.java
index 5e40fc89..4e768470 100644
--- a/src/main/java/com/samskivert/jdbc/RepositoryUnit.java
+++ b/src/main/java/com/samskivert/jdbc/RepositoryUnit.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/ResultUnit.java b/src/main/java/com/samskivert/jdbc/ResultUnit.java
index a3841725..5c7db7b0 100644
--- a/src/main/java/com/samskivert/jdbc/ResultUnit.java
+++ b/src/main/java/com/samskivert/jdbc/ResultUnit.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/SimpleRepository.java b/src/main/java/com/samskivert/jdbc/SimpleRepository.java
index 72cfa3c4..762a5b5f 100644
--- a/src/main/java/com/samskivert/jdbc/SimpleRepository.java
+++ b/src/main/java/com/samskivert/jdbc/SimpleRepository.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java b/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java
index da3c0997..30ac40b2 100644
--- a/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java
+++ b/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/TransitionRepository.java b/src/main/java/com/samskivert/jdbc/TransitionRepository.java
index 9b1c2b5d..11f7cec6 100644
--- a/src/main/java/com/samskivert/jdbc/TransitionRepository.java
+++ b/src/main/java/com/samskivert/jdbc/TransitionRepository.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/WriteOnlyUnit.java b/src/main/java/com/samskivert/jdbc/WriteOnlyUnit.java
index 155aa720..8a922c01 100644
--- a/src/main/java/com/samskivert/jdbc/WriteOnlyUnit.java
+++ b/src/main/java/com/samskivert/jdbc/WriteOnlyUnit.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/jora/Cursor.java b/src/main/java/com/samskivert/jdbc/jora/Cursor.java
index 6d821cc6..0be1d50e 100644
--- a/src/main/java/com/samskivert/jdbc/jora/Cursor.java
+++ b/src/main/java/com/samskivert/jdbc/jora/Cursor.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/jora/DataTransferError.java b/src/main/java/com/samskivert/jdbc/jora/DataTransferError.java
index 489627a7..50d1fc24 100644
--- a/src/main/java/com/samskivert/jdbc/jora/DataTransferError.java
+++ b/src/main/java/com/samskivert/jdbc/jora/DataTransferError.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/jora/FieldDescriptor.java b/src/main/java/com/samskivert/jdbc/jora/FieldDescriptor.java
index 85048b72..e49a25be 100644
--- a/src/main/java/com/samskivert/jdbc/jora/FieldDescriptor.java
+++ b/src/main/java/com/samskivert/jdbc/jora/FieldDescriptor.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/jora/FieldMask.java b/src/main/java/com/samskivert/jdbc/jora/FieldMask.java
index cb5b9f40..56555482 100644
--- a/src/main/java/com/samskivert/jdbc/jora/FieldMask.java
+++ b/src/main/java/com/samskivert/jdbc/jora/FieldMask.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/jora/README b/src/main/java/com/samskivert/jdbc/jora/README
index b6e77e41..8fdd810a 100644
--- a/src/main/java/com/samskivert/jdbc/jora/README
+++ b/src/main/java/com/samskivert/jdbc/jora/README
@@ -25,5 +25,3 @@ The original version can be found here: http://www.ispras.ru/~knizhnik/
 (or at least it could when I wrote this README).
 
 - mdb (2/12/2001)
-
-$Id: README,v 1.2 2001/08/11 22:53:13 mdb Exp $
diff --git a/src/main/java/com/samskivert/jdbc/jora/Table.java b/src/main/java/com/samskivert/jdbc/jora/Table.java
index 8aaeff85..bf4e65a1 100644
--- a/src/main/java/com/samskivert/jdbc/jora/Table.java
+++ b/src/main/java/com/samskivert/jdbc/jora/Table.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/jdbc/jora/package.html b/src/main/java/com/samskivert/jdbc/jora/package.html
index 50b281e7..11e0cd20 100644
--- a/src/main/java/com/samskivert/jdbc/jora/package.html
+++ b/src/main/java/com/samskivert/jdbc/jora/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:30 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/jdbc/package.html b/src/main/java/com/samskivert/jdbc/package.html
index 89ab74a4..c6204d5d 100644
--- a/src/main/java/com/samskivert/jdbc/package.html
+++ b/src/main/java/com/samskivert/jdbc/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:30 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/net/AddressUtil.java b/src/main/java/com/samskivert/net/AddressUtil.java
index b30a519a..1418b180 100644
--- a/src/main/java/com/samskivert/net/AddressUtil.java
+++ b/src/main/java/com/samskivert/net/AddressUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/AttachableURLFactory.java b/src/main/java/com/samskivert/net/AttachableURLFactory.java
index 9a8fee9d..a336eb73 100644
--- a/src/main/java/com/samskivert/net/AttachableURLFactory.java
+++ b/src/main/java/com/samskivert/net/AttachableURLFactory.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/HttpPostUtil.java b/src/main/java/com/samskivert/net/HttpPostUtil.java
index 8b0f577b..84c23203 100644
--- a/src/main/java/com/samskivert/net/HttpPostUtil.java
+++ b/src/main/java/com/samskivert/net/HttpPostUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/MACUtil.java b/src/main/java/com/samskivert/net/MACUtil.java
index 97c1d430..3098b5cf 100644
--- a/src/main/java/com/samskivert/net/MACUtil.java
+++ b/src/main/java/com/samskivert/net/MACUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/MailUtil.java b/src/main/java/com/samskivert/net/MailUtil.java
index e7f08111..aa31fea2 100644
--- a/src/main/java/com/samskivert/net/MailUtil.java
+++ b/src/main/java/com/samskivert/net/MailUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/PathUtil.java b/src/main/java/com/samskivert/net/PathUtil.java
index ba99e77d..d26ce7f7 100644
--- a/src/main/java/com/samskivert/net/PathUtil.java
+++ b/src/main/java/com/samskivert/net/PathUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/cddb/CDDB.java b/src/main/java/com/samskivert/net/cddb/CDDB.java
index b4e4183b..8fa17526 100644
--- a/src/main/java/com/samskivert/net/cddb/CDDB.java
+++ b/src/main/java/com/samskivert/net/cddb/CDDB.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/cddb/CDDBException.java b/src/main/java/com/samskivert/net/cddb/CDDBException.java
index c7ad00a3..c5fe6ef7 100644
--- a/src/main/java/com/samskivert/net/cddb/CDDBException.java
+++ b/src/main/java/com/samskivert/net/cddb/CDDBException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/cddb/CDDBProtocol.java b/src/main/java/com/samskivert/net/cddb/CDDBProtocol.java
index 2a441881..4863a9f2 100644
--- a/src/main/java/com/samskivert/net/cddb/CDDBProtocol.java
+++ b/src/main/java/com/samskivert/net/cddb/CDDBProtocol.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/cddb/CDDBTest.java b/src/main/java/com/samskivert/net/cddb/CDDBTest.java
index f07dca8b..a9d91e02 100644
--- a/src/main/java/com/samskivert/net/cddb/CDDBTest.java
+++ b/src/main/java/com/samskivert/net/cddb/CDDBTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/net/cddb/package.html b/src/main/java/com/samskivert/net/cddb/package.html
index 2413df73..8cf34fcf 100644
--- a/src/main/java/com/samskivert/net/cddb/package.html
+++ b/src/main/java/com/samskivert/net/cddb/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/net/package.html b/src/main/java/com/samskivert/net/package.html
index 377c057c..087a2c80 100644
--- a/src/main/java/com/samskivert/net/package.html
+++ b/src/main/java/com/samskivert/net/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/package.html b/src/main/java/com/samskivert/package.html
index 4a9c83a2..19f2bba3 100644
--- a/src/main/java/com/samskivert/package.html
+++ b/src/main/java/com/samskivert/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:30 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/servlet/HttpErrorException.java b/src/main/java/com/samskivert/servlet/HttpErrorException.java
index 8c6eaf95..09e992dc 100644
--- a/src/main/java/com/samskivert/servlet/HttpErrorException.java
+++ b/src/main/java/com/samskivert/servlet/HttpErrorException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java b/src/main/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java
index 2a3419ea..dc2fb524 100644
--- a/src/main/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java
+++ b/src/main/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java b/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
index 3d644f2f..bc1aa876 100644
--- a/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
+++ b/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/MessageManager.java b/src/main/java/com/samskivert/servlet/MessageManager.java
index 7f31b097..d1c32b80 100644
--- a/src/main/java/com/samskivert/servlet/MessageManager.java
+++ b/src/main/java/com/samskivert/servlet/MessageManager.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/RedirectException.java b/src/main/java/com/samskivert/servlet/RedirectException.java
index 8243c18b..1c39d425 100644
--- a/src/main/java/com/samskivert/servlet/RedirectException.java
+++ b/src/main/java/com/samskivert/servlet/RedirectException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/Site.java b/src/main/java/com/samskivert/servlet/Site.java
index 1503620e..c72eeef0 100644
--- a/src/main/java/com/samskivert/servlet/Site.java
+++ b/src/main/java/com/samskivert/servlet/Site.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/SiteIdentifier.java b/src/main/java/com/samskivert/servlet/SiteIdentifier.java
index d99e704e..98ef5ece 100644
--- a/src/main/java/com/samskivert/servlet/SiteIdentifier.java
+++ b/src/main/java/com/samskivert/servlet/SiteIdentifier.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/SiteResourceLoader.java b/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
index 94761e74..1dbacc85 100644
--- a/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
+++ b/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/package.html b/src/main/java/com/samskivert/servlet/package.html
index f6c073e5..95344da6 100644
--- a/src/main/java/com/samskivert/servlet/package.html
+++ b/src/main/java/com/samskivert/servlet/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/servlet/user/AuthenticationFailedException.java b/src/main/java/com/samskivert/servlet/user/AuthenticationFailedException.java
index dd1a79d5..2bf98ade 100644
--- a/src/main/java/com/samskivert/servlet/user/AuthenticationFailedException.java
+++ b/src/main/java/com/samskivert/servlet/user/AuthenticationFailedException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/Authenticator.java b/src/main/java/com/samskivert/servlet/user/Authenticator.java
index 15bd1686..203f1e0c 100644
--- a/src/main/java/com/samskivert/servlet/user/Authenticator.java
+++ b/src/main/java/com/samskivert/servlet/user/Authenticator.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/InvalidPasswordException.java b/src/main/java/com/samskivert/servlet/user/InvalidPasswordException.java
index ee29ce5e..2cd4ae49 100644
--- a/src/main/java/com/samskivert/servlet/user/InvalidPasswordException.java
+++ b/src/main/java/com/samskivert/servlet/user/InvalidPasswordException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/InvalidUsernameException.java b/src/main/java/com/samskivert/servlet/user/InvalidUsernameException.java
index bc579e6b..387173c1 100644
--- a/src/main/java/com/samskivert/servlet/user/InvalidUsernameException.java
+++ b/src/main/java/com/samskivert/servlet/user/InvalidUsernameException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/NoSuchUserException.java b/src/main/java/com/samskivert/servlet/user/NoSuchUserException.java
index 2f955179..e91726bc 100644
--- a/src/main/java/com/samskivert/servlet/user/NoSuchUserException.java
+++ b/src/main/java/com/samskivert/servlet/user/NoSuchUserException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/Password.java b/src/main/java/com/samskivert/servlet/user/Password.java
index c6fca6df..5457ae26 100644
--- a/src/main/java/com/samskivert/servlet/user/Password.java
+++ b/src/main/java/com/samskivert/servlet/user/Password.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/User.java b/src/main/java/com/samskivert/servlet/user/User.java
index 7b859caf..45e93b81 100644
--- a/src/main/java/com/samskivert/servlet/user/User.java
+++ b/src/main/java/com/samskivert/servlet/user/User.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/UserExistsException.java b/src/main/java/com/samskivert/servlet/user/UserExistsException.java
index c4a9d1ba..58c7c66d 100644
--- a/src/main/java/com/samskivert/servlet/user/UserExistsException.java
+++ b/src/main/java/com/samskivert/servlet/user/UserExistsException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/UserManager.java b/src/main/java/com/samskivert/servlet/user/UserManager.java
index 6d230245..632de3fd 100644
--- a/src/main/java/com/samskivert/servlet/user/UserManager.java
+++ b/src/main/java/com/samskivert/servlet/user/UserManager.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/UserRepository.java b/src/main/java/com/samskivert/servlet/user/UserRepository.java
index a636a8a9..82f91a9b 100644
--- a/src/main/java/com/samskivert/servlet/user/UserRepository.java
+++ b/src/main/java/com/samskivert/servlet/user/UserRepository.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/UserUtil.java b/src/main/java/com/samskivert/servlet/user/UserUtil.java
index 6887f0b0..cca24be9 100644
--- a/src/main/java/com/samskivert/servlet/user/UserUtil.java
+++ b/src/main/java/com/samskivert/servlet/user/UserUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/Username.java b/src/main/java/com/samskivert/servlet/user/Username.java
index bae5a202..14f33dfe 100644
--- a/src/main/java/com/samskivert/servlet/user/Username.java
+++ b/src/main/java/com/samskivert/servlet/user/Username.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/user/package.html b/src/main/java/com/samskivert/servlet/user/package.html
index 08622f88..4fc60cd2 100644
--- a/src/main/java/com/samskivert/servlet/user/package.html
+++ b/src/main/java/com/samskivert/servlet/user/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/servlet/util/CookieUtil.java b/src/main/java/com/samskivert/servlet/util/CookieUtil.java
index 58a92e51..41e45ee0 100644
--- a/src/main/java/com/samskivert/servlet/util/CookieUtil.java
+++ b/src/main/java/com/samskivert/servlet/util/CookieUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/util/DataValidationException.java b/src/main/java/com/samskivert/servlet/util/DataValidationException.java
index 4e226ad2..01b0b090 100644
--- a/src/main/java/com/samskivert/servlet/util/DataValidationException.java
+++ b/src/main/java/com/samskivert/servlet/util/DataValidationException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/util/ExceptionMap.java b/src/main/java/com/samskivert/servlet/util/ExceptionMap.java
index 0c30a214..13092d5c 100644
--- a/src/main/java/com/samskivert/servlet/util/ExceptionMap.java
+++ b/src/main/java/com/samskivert/servlet/util/ExceptionMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/util/FriendlyException.java b/src/main/java/com/samskivert/servlet/util/FriendlyException.java
index 4fc27177..ea2a3654 100644
--- a/src/main/java/com/samskivert/servlet/util/FriendlyException.java
+++ b/src/main/java/com/samskivert/servlet/util/FriendlyException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/util/HTMLUtil.java b/src/main/java/com/samskivert/servlet/util/HTMLUtil.java
index 8692380d..b0ac8ada 100644
--- a/src/main/java/com/samskivert/servlet/util/HTMLUtil.java
+++ b/src/main/java/com/samskivert/servlet/util/HTMLUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/util/ParameterUtil.java b/src/main/java/com/samskivert/servlet/util/ParameterUtil.java
index f2baf052..1b81b850 100644
--- a/src/main/java/com/samskivert/servlet/util/ParameterUtil.java
+++ b/src/main/java/com/samskivert/servlet/util/ParameterUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/util/RequestUtils.java b/src/main/java/com/samskivert/servlet/util/RequestUtils.java
index 70c4950f..87eed4ae 100644
--- a/src/main/java/com/samskivert/servlet/util/RequestUtils.java
+++ b/src/main/java/com/samskivert/servlet/util/RequestUtils.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/util/ServiceWaiter.java b/src/main/java/com/samskivert/servlet/util/ServiceWaiter.java
index 7972e00d..84e11bd2 100644
--- a/src/main/java/com/samskivert/servlet/util/ServiceWaiter.java
+++ b/src/main/java/com/samskivert/servlet/util/ServiceWaiter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/servlet/util/package.html b/src/main/java/com/samskivert/servlet/util/package.html
index 2a025480..1d767080 100644
--- a/src/main/java/com/samskivert/servlet/util/package.html
+++ b/src/main/java/com/samskivert/servlet/util/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/swing/AWTResultListener.java b/src/main/java/com/samskivert/swing/AWTResultListener.java
index 44f571bc..95bf95e1 100644
--- a/src/main/java/com/samskivert/swing/AWTResultListener.java
+++ b/src/main/java/com/samskivert/swing/AWTResultListener.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/AbsoluteLayout.java b/src/main/java/com/samskivert/swing/AbsoluteLayout.java
index b6f2ee8f..97ff9fb8 100644
--- a/src/main/java/com/samskivert/swing/AbsoluteLayout.java
+++ b/src/main/java/com/samskivert/swing/AbsoluteLayout.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/CollapsibleList.java b/src/main/java/com/samskivert/swing/CollapsibleList.java
index b86830c6..dbc45fc7 100644
--- a/src/main/java/com/samskivert/swing/CollapsibleList.java
+++ b/src/main/java/com/samskivert/swing/CollapsibleList.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/CollapsiblePanel.java b/src/main/java/com/samskivert/swing/CollapsiblePanel.java
index 0d765215..d6c52766 100644
--- a/src/main/java/com/samskivert/swing/CollapsiblePanel.java
+++ b/src/main/java/com/samskivert/swing/CollapsiblePanel.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/ComboButtonBox.java b/src/main/java/com/samskivert/swing/ComboButtonBox.java
index ebbd9439..6943e001 100644
--- a/src/main/java/com/samskivert/swing/ComboButtonBox.java
+++ b/src/main/java/com/samskivert/swing/ComboButtonBox.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/CommandButton.java b/src/main/java/com/samskivert/swing/CommandButton.java
index 908ba778..ee73e694 100644
--- a/src/main/java/com/samskivert/swing/CommandButton.java
+++ b/src/main/java/com/samskivert/swing/CommandButton.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/ControlledPanel.java b/src/main/java/com/samskivert/swing/ControlledPanel.java
index 18aca424..4fce0b81 100644
--- a/src/main/java/com/samskivert/swing/ControlledPanel.java
+++ b/src/main/java/com/samskivert/swing/ControlledPanel.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/Controller.java b/src/main/java/com/samskivert/swing/Controller.java
index 5920bc84..289d833c 100644
--- a/src/main/java/com/samskivert/swing/Controller.java
+++ b/src/main/java/com/samskivert/swing/Controller.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/ControllerProvider.java b/src/main/java/com/samskivert/swing/ControllerProvider.java
index c8c07b2c..c6665fd7 100644
--- a/src/main/java/com/samskivert/swing/ControllerProvider.java
+++ b/src/main/java/com/samskivert/swing/ControllerProvider.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/DimenInfo.java b/src/main/java/com/samskivert/swing/DimenInfo.java
index 2d54f577..260ba0ba 100644
--- a/src/main/java/com/samskivert/swing/DimenInfo.java
+++ b/src/main/java/com/samskivert/swing/DimenInfo.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/DimmedIcon.java b/src/main/java/com/samskivert/swing/DimmedIcon.java
index de5c901a..c07124fd 100644
--- a/src/main/java/com/samskivert/swing/DimmedIcon.java
+++ b/src/main/java/com/samskivert/swing/DimmedIcon.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/EnablingAdapter.java b/src/main/java/com/samskivert/swing/EnablingAdapter.java
index 416fa1b5..b74b1914 100644
--- a/src/main/java/com/samskivert/swing/EnablingAdapter.java
+++ b/src/main/java/com/samskivert/swing/EnablingAdapter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/GroupLayout.java b/src/main/java/com/samskivert/swing/GroupLayout.java
index 09b92a2b..eeddf140 100644
--- a/src/main/java/com/samskivert/swing/GroupLayout.java
+++ b/src/main/java/com/samskivert/swing/GroupLayout.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/GroupLayoutTest.java b/src/main/java/com/samskivert/swing/GroupLayoutTest.java
index a7c8b9f7..eeb469e1 100644
--- a/src/main/java/com/samskivert/swing/GroupLayoutTest.java
+++ b/src/main/java/com/samskivert/swing/GroupLayoutTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/HGroupLayout.java b/src/main/java/com/samskivert/swing/HGroupLayout.java
index bcc03bf0..8818b631 100644
--- a/src/main/java/com/samskivert/swing/HGroupLayout.java
+++ b/src/main/java/com/samskivert/swing/HGroupLayout.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/IntField.java b/src/main/java/com/samskivert/swing/IntField.java
index cf8db545..f1377117 100644
--- a/src/main/java/com/samskivert/swing/IntField.java
+++ b/src/main/java/com/samskivert/swing/IntField.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/IntegerTableCellRenderer.java b/src/main/java/com/samskivert/swing/IntegerTableCellRenderer.java
index f944542b..07531c61 100644
--- a/src/main/java/com/samskivert/swing/IntegerTableCellRenderer.java
+++ b/src/main/java/com/samskivert/swing/IntegerTableCellRenderer.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/JInternalDialog.java b/src/main/java/com/samskivert/swing/JInternalDialog.java
index ad3619d7..2f20c05c 100644
--- a/src/main/java/com/samskivert/swing/JInternalDialog.java
+++ b/src/main/java/com/samskivert/swing/JInternalDialog.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/Label.java b/src/main/java/com/samskivert/swing/Label.java
index d4f5b787..0ec2b656 100644
--- a/src/main/java/com/samskivert/swing/Label.java
+++ b/src/main/java/com/samskivert/swing/Label.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/LabelSausage.java b/src/main/java/com/samskivert/swing/LabelSausage.java
index 964eb1ed..ff89c11d 100644
--- a/src/main/java/com/samskivert/swing/LabelSausage.java
+++ b/src/main/java/com/samskivert/swing/LabelSausage.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/LabelStyleConstants.java b/src/main/java/com/samskivert/swing/LabelStyleConstants.java
index 029e8f0f..ab4fcd7d 100644
--- a/src/main/java/com/samskivert/swing/LabelStyleConstants.java
+++ b/src/main/java/com/samskivert/swing/LabelStyleConstants.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/LazyComponent.java b/src/main/java/com/samskivert/swing/LazyComponent.java
index 946c879c..0eddac39 100644
--- a/src/main/java/com/samskivert/swing/LazyComponent.java
+++ b/src/main/java/com/samskivert/swing/LazyComponent.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/MultiLineLabel.java b/src/main/java/com/samskivert/swing/MultiLineLabel.java
index f5b45d18..29cd152c 100644
--- a/src/main/java/com/samskivert/swing/MultiLineLabel.java
+++ b/src/main/java/com/samskivert/swing/MultiLineLabel.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/ObjectEditorTable.java b/src/main/java/com/samskivert/swing/ObjectEditorTable.java
index 07f8fa23..880a764c 100644
--- a/src/main/java/com/samskivert/swing/ObjectEditorTable.java
+++ b/src/main/java/com/samskivert/swing/ObjectEditorTable.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/RadialLabelSausage.java b/src/main/java/com/samskivert/swing/RadialLabelSausage.java
index 1054a0c3..fa19ce08 100644
--- a/src/main/java/com/samskivert/swing/RadialLabelSausage.java
+++ b/src/main/java/com/samskivert/swing/RadialLabelSausage.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/RadialMenu.java b/src/main/java/com/samskivert/swing/RadialMenu.java
index 1e704845..81bd4591 100644
--- a/src/main/java/com/samskivert/swing/RadialMenu.java
+++ b/src/main/java/com/samskivert/swing/RadialMenu.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/RadialMenuItem.java b/src/main/java/com/samskivert/swing/RadialMenuItem.java
index bfee60e9..aaef2b3f 100644
--- a/src/main/java/com/samskivert/swing/RadialMenuItem.java
+++ b/src/main/java/com/samskivert/swing/RadialMenuItem.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/RuntimeAdjust.java b/src/main/java/com/samskivert/swing/RuntimeAdjust.java
index aa1fa4f3..ad9f84b2 100644
--- a/src/main/java/com/samskivert/swing/RuntimeAdjust.java
+++ b/src/main/java/com/samskivert/swing/RuntimeAdjust.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/SafeLayeredPane.java b/src/main/java/com/samskivert/swing/SafeLayeredPane.java
index 5efd29e7..2de0a9af 100644
--- a/src/main/java/com/samskivert/swing/SafeLayeredPane.java
+++ b/src/main/java/com/samskivert/swing/SafeLayeredPane.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/ScaledIcon.java b/src/main/java/com/samskivert/swing/ScaledIcon.java
index 9d593041..6f9828a6 100644
--- a/src/main/java/com/samskivert/swing/ScaledIcon.java
+++ b/src/main/java/com/samskivert/swing/ScaledIcon.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/ScrollBox.java b/src/main/java/com/samskivert/swing/ScrollBox.java
index 0923427d..36f8cfac 100644
--- a/src/main/java/com/samskivert/swing/ScrollBox.java
+++ b/src/main/java/com/samskivert/swing/ScrollBox.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/ScrollablePanel.java b/src/main/java/com/samskivert/swing/ScrollablePanel.java
index 3ccefc1d..5ed12d4d 100644
--- a/src/main/java/com/samskivert/swing/ScrollablePanel.java
+++ b/src/main/java/com/samskivert/swing/ScrollablePanel.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/ShapeIcon.java b/src/main/java/com/samskivert/swing/ShapeIcon.java
index c1ad661d..8e5e21ed 100644
--- a/src/main/java/com/samskivert/swing/ShapeIcon.java
+++ b/src/main/java/com/samskivert/swing/ShapeIcon.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/SimpleSlider.java b/src/main/java/com/samskivert/swing/SimpleSlider.java
index b7efbf00..618140d9 100644
--- a/src/main/java/com/samskivert/swing/SimpleSlider.java
+++ b/src/main/java/com/samskivert/swing/SimpleSlider.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/SmartPolygon.java b/src/main/java/com/samskivert/swing/SmartPolygon.java
index ade60b45..03e7e261 100644
--- a/src/main/java/com/samskivert/swing/SmartPolygon.java
+++ b/src/main/java/com/samskivert/swing/SmartPolygon.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/Spacer.java b/src/main/java/com/samskivert/swing/Spacer.java
index ace1d905..7b03bdc0 100644
--- a/src/main/java/com/samskivert/swing/Spacer.java
+++ b/src/main/java/com/samskivert/swing/Spacer.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/TGraphics2D.java b/src/main/java/com/samskivert/swing/TGraphics2D.java
index 47d92c04..e3b6cfb1 100644
--- a/src/main/java/com/samskivert/swing/TGraphics2D.java
+++ b/src/main/java/com/samskivert/swing/TGraphics2D.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/TableMap.java b/src/main/java/com/samskivert/swing/TableMap.java
index 3031e137..71799476 100644
--- a/src/main/java/com/samskivert/swing/TableMap.java
+++ b/src/main/java/com/samskivert/swing/TableMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/TableSorter.java b/src/main/java/com/samskivert/swing/TableSorter.java
index e5a200ea..85a85f69 100644
--- a/src/main/java/com/samskivert/swing/TableSorter.java
+++ b/src/main/java/com/samskivert/swing/TableSorter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/Timer.java b/src/main/java/com/samskivert/swing/Timer.java
index 42ef8ec5..0de6ad49 100644
--- a/src/main/java/com/samskivert/swing/Timer.java
+++ b/src/main/java/com/samskivert/swing/Timer.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/VGroupLayout.java b/src/main/java/com/samskivert/swing/VGroupLayout.java
index 4bfe234e..8cf0cfd3 100644
--- a/src/main/java/com/samskivert/swing/VGroupLayout.java
+++ b/src/main/java/com/samskivert/swing/VGroupLayout.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java b/src/main/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java
index 9c61d03f..02bcc62d 100644
--- a/src/main/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java
+++ b/src/main/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/dnd/DnDManager.java b/src/main/java/com/samskivert/swing/dnd/DnDManager.java
index 04f0afb1..1c2292b8 100644
--- a/src/main/java/com/samskivert/swing/dnd/DnDManager.java
+++ b/src/main/java/com/samskivert/swing/dnd/DnDManager.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/dnd/DragSource.java b/src/main/java/com/samskivert/swing/dnd/DragSource.java
index ff2aed0b..5d222664 100644
--- a/src/main/java/com/samskivert/swing/dnd/DragSource.java
+++ b/src/main/java/com/samskivert/swing/dnd/DragSource.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/dnd/DropTarget.java b/src/main/java/com/samskivert/swing/dnd/DropTarget.java
index 157ff92e..22c0f99e 100644
--- a/src/main/java/com/samskivert/swing/dnd/DropTarget.java
+++ b/src/main/java/com/samskivert/swing/dnd/DropTarget.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/dnd/package.html b/src/main/java/com/samskivert/swing/dnd/package.html
index 9aeb4036..4612d92c 100644
--- a/src/main/java/com/samskivert/swing/dnd/package.html
+++ b/src/main/java/com/samskivert/swing/dnd/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001-2005 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/swing/event/AncestorAdapter.java b/src/main/java/com/samskivert/swing/event/AncestorAdapter.java
index 04d98d19..4601d863 100644
--- a/src/main/java/com/samskivert/swing/event/AncestorAdapter.java
+++ b/src/main/java/com/samskivert/swing/event/AncestorAdapter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/event/CommandEvent.java b/src/main/java/com/samskivert/swing/event/CommandEvent.java
index ed0152e6..669e7091 100644
--- a/src/main/java/com/samskivert/swing/event/CommandEvent.java
+++ b/src/main/java/com/samskivert/swing/event/CommandEvent.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/event/DocumentAdapter.java b/src/main/java/com/samskivert/swing/event/DocumentAdapter.java
index 47044d05..cf0985af 100644
--- a/src/main/java/com/samskivert/swing/event/DocumentAdapter.java
+++ b/src/main/java/com/samskivert/swing/event/DocumentAdapter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/event/MouseArmingAdapter.java b/src/main/java/com/samskivert/swing/event/MouseArmingAdapter.java
index cffdcc68..7f9ff19b 100644
--- a/src/main/java/com/samskivert/swing/event/MouseArmingAdapter.java
+++ b/src/main/java/com/samskivert/swing/event/MouseArmingAdapter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/event/PopupMenuAdapter.java b/src/main/java/com/samskivert/swing/event/PopupMenuAdapter.java
index e1c637ea..dbd81fc2 100644
--- a/src/main/java/com/samskivert/swing/event/PopupMenuAdapter.java
+++ b/src/main/java/com/samskivert/swing/event/PopupMenuAdapter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/event/package.html b/src/main/java/com/samskivert/swing/event/package.html
index 3725d49e..a171440f 100644
--- a/src/main/java/com/samskivert/swing/event/package.html
+++ b/src/main/java/com/samskivert/swing/event/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001-2005 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/swing/package.html b/src/main/java/com/samskivert/swing/package.html
index 8b107696..eb1d4a39 100644
--- a/src/main/java/com/samskivert/swing/package.html
+++ b/src/main/java/com/samskivert/swing/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/swing/util/ButtonUtil.java b/src/main/java/com/samskivert/swing/util/ButtonUtil.java
index d65fa8c4..cff0b114 100644
--- a/src/main/java/com/samskivert/swing/util/ButtonUtil.java
+++ b/src/main/java/com/samskivert/swing/util/ButtonUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/DialogUtil.java b/src/main/java/com/samskivert/swing/util/DialogUtil.java
index 402fc664..96a63b74 100644
--- a/src/main/java/com/samskivert/swing/util/DialogUtil.java
+++ b/src/main/java/com/samskivert/swing/util/DialogUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/MenuUtil.java b/src/main/java/com/samskivert/swing/util/MenuUtil.java
index a752f965..24333b77 100644
--- a/src/main/java/com/samskivert/swing/util/MenuUtil.java
+++ b/src/main/java/com/samskivert/swing/util/MenuUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/MouseHijacker.java b/src/main/java/com/samskivert/swing/util/MouseHijacker.java
index a0d98582..7cd455cc 100644
--- a/src/main/java/com/samskivert/swing/util/MouseHijacker.java
+++ b/src/main/java/com/samskivert/swing/util/MouseHijacker.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/ProximityTracker.java b/src/main/java/com/samskivert/swing/util/ProximityTracker.java
index 14332124..e9dd89c6 100644
--- a/src/main/java/com/samskivert/swing/util/ProximityTracker.java
+++ b/src/main/java/com/samskivert/swing/util/ProximityTracker.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/RetryableTask.java b/src/main/java/com/samskivert/swing/util/RetryableTask.java
index 0077fc08..f6565e0b 100644
--- a/src/main/java/com/samskivert/swing/util/RetryableTask.java
+++ b/src/main/java/com/samskivert/swing/util/RetryableTask.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/SwingUtil.java b/src/main/java/com/samskivert/swing/util/SwingUtil.java
index a827a286..41e76313 100644
--- a/src/main/java/com/samskivert/swing/util/SwingUtil.java
+++ b/src/main/java/com/samskivert/swing/util/SwingUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/Task.java b/src/main/java/com/samskivert/swing/util/Task.java
index 48ccfe46..e1bb2927 100644
--- a/src/main/java/com/samskivert/swing/util/Task.java
+++ b/src/main/java/com/samskivert/swing/util/Task.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/TaskAdapter.java b/src/main/java/com/samskivert/swing/util/TaskAdapter.java
index 81905fdf..b333b92a 100644
--- a/src/main/java/com/samskivert/swing/util/TaskAdapter.java
+++ b/src/main/java/com/samskivert/swing/util/TaskAdapter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/TaskMaster.java b/src/main/java/com/samskivert/swing/util/TaskMaster.java
index 897af7ce..93ad33bd 100644
--- a/src/main/java/com/samskivert/swing/util/TaskMaster.java
+++ b/src/main/java/com/samskivert/swing/util/TaskMaster.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/TaskObserver.java b/src/main/java/com/samskivert/swing/util/TaskObserver.java
index 8f7d5743..3efddaa5 100644
--- a/src/main/java/com/samskivert/swing/util/TaskObserver.java
+++ b/src/main/java/com/samskivert/swing/util/TaskObserver.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/swing/util/package.html b/src/main/java/com/samskivert/swing/util/package.html
index 66a675e8..c88a8bd1 100644
--- a/src/main/java/com/samskivert/swing/util/package.html
+++ b/src/main/java/com/samskivert/swing/util/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/test/TestUtil.java b/src/main/java/com/samskivert/test/TestUtil.java
index 4edb0230..a18bf6de 100644
--- a/src/main/java/com/samskivert/test/TestUtil.java
+++ b/src/main/java/com/samskivert/test/TestUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/test/package.html b/src/main/java/com/samskivert/test/package.html
index a621f259..68f8cb67 100644
--- a/src/main/java/com/samskivert/test/package.html
+++ b/src/main/java/com/samskivert/test/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001-2005 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/text/MessageUtil.java b/src/main/java/com/samskivert/text/MessageUtil.java
index 3274cac3..f25b2c2f 100644
--- a/src/main/java/com/samskivert/text/MessageUtil.java
+++ b/src/main/java/com/samskivert/text/MessageUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/text/package.html b/src/main/java/com/samskivert/text/package.html
index 6123145c..42b542ad 100644
--- a/src/main/java/com/samskivert/text/package.html
+++ b/src/main/java/com/samskivert/text/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001-2005 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/util/AbstractIntSet.java b/src/main/java/com/samskivert/util/AbstractIntSet.java
index f1bed9e7..ad9eed77 100644
--- a/src/main/java/com/samskivert/util/AbstractIntSet.java
+++ b/src/main/java/com/samskivert/util/AbstractIntSet.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/AbstractInterator.java b/src/main/java/com/samskivert/util/AbstractInterator.java
index 6aacd234..f799d10a 100644
--- a/src/main/java/com/samskivert/util/AbstractInterator.java
+++ b/src/main/java/com/samskivert/util/AbstractInterator.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ArrayIntSet.java b/src/main/java/com/samskivert/util/ArrayIntSet.java
index aade8e38..b718a952 100644
--- a/src/main/java/com/samskivert/util/ArrayIntSet.java
+++ b/src/main/java/com/samskivert/util/ArrayIntSet.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ArrayUtil.java b/src/main/java/com/samskivert/util/ArrayUtil.java
index 90d84716..26bcc57c 100644
--- a/src/main/java/com/samskivert/util/ArrayUtil.java
+++ b/src/main/java/com/samskivert/util/ArrayUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/AuditLogger.java b/src/main/java/com/samskivert/util/AuditLogger.java
index 9f0338cc..f8391d2b 100644
--- a/src/main/java/com/samskivert/util/AuditLogger.java
+++ b/src/main/java/com/samskivert/util/AuditLogger.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/BaseArrayList.java b/src/main/java/com/samskivert/util/BaseArrayList.java
index 33a37baa..69684a92 100644
--- a/src/main/java/com/samskivert/util/BaseArrayList.java
+++ b/src/main/java/com/samskivert/util/BaseArrayList.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/BasicRunQueue.java b/src/main/java/com/samskivert/util/BasicRunQueue.java
index 412893fa..c4e7fa58 100644
--- a/src/main/java/com/samskivert/util/BasicRunQueue.java
+++ b/src/main/java/com/samskivert/util/BasicRunQueue.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ByteEnum.java b/src/main/java/com/samskivert/util/ByteEnum.java
index afc31654..18829511 100644
--- a/src/main/java/com/samskivert/util/ByteEnum.java
+++ b/src/main/java/com/samskivert/util/ByteEnum.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ByteEnumUtil.java b/src/main/java/com/samskivert/util/ByteEnumUtil.java
index 88d4c90d..69be8773 100644
--- a/src/main/java/com/samskivert/util/ByteEnumUtil.java
+++ b/src/main/java/com/samskivert/util/ByteEnumUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/CalendarUtil.java b/src/main/java/com/samskivert/util/CalendarUtil.java
index 05f0344b..2489dde3 100644
--- a/src/main/java/com/samskivert/util/CalendarUtil.java
+++ b/src/main/java/com/samskivert/util/CalendarUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Calendars.java b/src/main/java/com/samskivert/util/Calendars.java
index 047411ef..d0f5938a 100644
--- a/src/main/java/com/samskivert/util/Calendars.java
+++ b/src/main/java/com/samskivert/util/Calendars.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Callables.java b/src/main/java/com/samskivert/util/Callables.java
index 65280f46..c0342e21 100644
--- a/src/main/java/com/samskivert/util/Callables.java
+++ b/src/main/java/com/samskivert/util/Callables.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ChainedResultListener.java b/src/main/java/com/samskivert/util/ChainedResultListener.java
index 2d8f04e8..fd514ed5 100644
--- a/src/main/java/com/samskivert/util/ChainedResultListener.java
+++ b/src/main/java/com/samskivert/util/ChainedResultListener.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/CheapIntMap.java b/src/main/java/com/samskivert/util/CheapIntMap.java
index 44fd98b1..63c78bcf 100644
--- a/src/main/java/com/samskivert/util/CheapIntMap.java
+++ b/src/main/java/com/samskivert/util/CheapIntMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ClassUtil.java b/src/main/java/com/samskivert/util/ClassUtil.java
index 58e405a0..d5ba2574 100644
--- a/src/main/java/com/samskivert/util/ClassUtil.java
+++ b/src/main/java/com/samskivert/util/ClassUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/CollectionUtil.java b/src/main/java/com/samskivert/util/CollectionUtil.java
index 744fc66b..fd71348d 100644
--- a/src/main/java/com/samskivert/util/CollectionUtil.java
+++ b/src/main/java/com/samskivert/util/CollectionUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Collections.java b/src/main/java/com/samskivert/util/Collections.java
index 69d2734f..1af7c642 100644
--- a/src/main/java/com/samskivert/util/Collections.java
+++ b/src/main/java/com/samskivert/util/Collections.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/CompactIntListUtil.java b/src/main/java/com/samskivert/util/CompactIntListUtil.java
index 1243858a..736c9175 100644
--- a/src/main/java/com/samskivert/util/CompactIntListUtil.java
+++ b/src/main/java/com/samskivert/util/CompactIntListUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ComparableArrayList.java b/src/main/java/com/samskivert/util/ComparableArrayList.java
index e061ba9e..bf5d01cc 100644
--- a/src/main/java/com/samskivert/util/ComparableArrayList.java
+++ b/src/main/java/com/samskivert/util/ComparableArrayList.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ComparableTuple.java b/src/main/java/com/samskivert/util/ComparableTuple.java
index 2992b366..d996080b 100644
--- a/src/main/java/com/samskivert/util/ComparableTuple.java
+++ b/src/main/java/com/samskivert/util/ComparableTuple.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Comparators.java b/src/main/java/com/samskivert/util/Comparators.java
index 21ef19e0..df802aab 100644
--- a/src/main/java/com/samskivert/util/Comparators.java
+++ b/src/main/java/com/samskivert/util/Comparators.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ComplainingListener.java b/src/main/java/com/samskivert/util/ComplainingListener.java
index 42679f96..39f16878 100644
--- a/src/main/java/com/samskivert/util/ComplainingListener.java
+++ b/src/main/java/com/samskivert/util/ComplainingListener.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Config.java b/src/main/java/com/samskivert/util/Config.java
index 7567fa0f..c23a39c5 100644
--- a/src/main/java/com/samskivert/util/Config.java
+++ b/src/main/java/com/samskivert/util/Config.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ConfigUtil.java b/src/main/java/com/samskivert/util/ConfigUtil.java
index e31d5190..2f7fbb77 100644
--- a/src/main/java/com/samskivert/util/ConfigUtil.java
+++ b/src/main/java/com/samskivert/util/ConfigUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/CountHashMap.java b/src/main/java/com/samskivert/util/CountHashMap.java
index f3d396f1..674d4e06 100644
--- a/src/main/java/com/samskivert/util/CountHashMap.java
+++ b/src/main/java/com/samskivert/util/CountHashMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/CountMap.java b/src/main/java/com/samskivert/util/CountMap.java
index 1213f264..bd6d3343 100644
--- a/src/main/java/com/samskivert/util/CountMap.java
+++ b/src/main/java/com/samskivert/util/CountMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Crypt.java b/src/main/java/com/samskivert/util/Crypt.java
index 3a9fbdf6..454c39ce 100644
--- a/src/main/java/com/samskivert/util/Crypt.java
+++ b/src/main/java/com/samskivert/util/Crypt.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/CurrencyUtil.java b/src/main/java/com/samskivert/util/CurrencyUtil.java
index 2f88eeb5..c5c977c5 100644
--- a/src/main/java/com/samskivert/util/CurrencyUtil.java
+++ b/src/main/java/com/samskivert/util/CurrencyUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/DebugChords.java b/src/main/java/com/samskivert/util/DebugChords.java
index 816c29ba..01dd6df5 100644
--- a/src/main/java/com/samskivert/util/DebugChords.java
+++ b/src/main/java/com/samskivert/util/DebugChords.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/DefaultLogProvider.java b/src/main/java/com/samskivert/util/DefaultLogProvider.java
index 7300eb3c..aef92c61 100644
--- a/src/main/java/com/samskivert/util/DefaultLogProvider.java
+++ b/src/main/java/com/samskivert/util/DefaultLogProvider.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/DependencyGraph.java b/src/main/java/com/samskivert/util/DependencyGraph.java
index 332c0e2d..93960efc 100644
--- a/src/main/java/com/samskivert/util/DependencyGraph.java
+++ b/src/main/java/com/samskivert/util/DependencyGraph.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ExpiringReference.java b/src/main/java/com/samskivert/util/ExpiringReference.java
index aaee791c..b847ba91 100644
--- a/src/main/java/com/samskivert/util/ExpiringReference.java
+++ b/src/main/java/com/samskivert/util/ExpiringReference.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/FailureListener.java b/src/main/java/com/samskivert/util/FailureListener.java
index ea802d37..dbfe0d05 100644
--- a/src/main/java/com/samskivert/util/FailureListener.java
+++ b/src/main/java/com/samskivert/util/FailureListener.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/FileUtil.java b/src/main/java/com/samskivert/util/FileUtil.java
index 7cbae6d7..d3907d4d 100644
--- a/src/main/java/com/samskivert/util/FileUtil.java
+++ b/src/main/java/com/samskivert/util/FileUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Folds.java b/src/main/java/com/samskivert/util/Folds.java
index fa30887c..68d7ffaf 100644
--- a/src/main/java/com/samskivert/util/Folds.java
+++ b/src/main/java/com/samskivert/util/Folds.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/FormatterUtil.java b/src/main/java/com/samskivert/util/FormatterUtil.java
index b1881bf3..8463e548 100644
--- a/src/main/java/com/samskivert/util/FormatterUtil.java
+++ b/src/main/java/com/samskivert/util/FormatterUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/GenUtil.java b/src/main/java/com/samskivert/util/GenUtil.java
index 251021d3..733cae83 100644
--- a/src/main/java/com/samskivert/util/GenUtil.java
+++ b/src/main/java/com/samskivert/util/GenUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/HashIntMap.java b/src/main/java/com/samskivert/util/HashIntMap.java
index 04777ebf..6d5c4036 100644
--- a/src/main/java/com/samskivert/util/HashIntMap.java
+++ b/src/main/java/com/samskivert/util/HashIntMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/HashIntSet.java b/src/main/java/com/samskivert/util/HashIntSet.java
index 22368ab5..51063017 100644
--- a/src/main/java/com/samskivert/util/HashIntSet.java
+++ b/src/main/java/com/samskivert/util/HashIntSet.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Histogram.java b/src/main/java/com/samskivert/util/Histogram.java
index 97f881cd..43e865b8 100644
--- a/src/main/java/com/samskivert/util/Histogram.java
+++ b/src/main/java/com/samskivert/util/Histogram.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/IntIntMap.java b/src/main/java/com/samskivert/util/IntIntMap.java
index d9dce8c0..7beafc2b 100644
--- a/src/main/java/com/samskivert/util/IntIntMap.java
+++ b/src/main/java/com/samskivert/util/IntIntMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/IntListUtil.java b/src/main/java/com/samskivert/util/IntListUtil.java
index 74125761..c6211af5 100644
--- a/src/main/java/com/samskivert/util/IntListUtil.java
+++ b/src/main/java/com/samskivert/util/IntListUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/IntMap.java b/src/main/java/com/samskivert/util/IntMap.java
index 19abb184..a519bc00 100644
--- a/src/main/java/com/samskivert/util/IntMap.java
+++ b/src/main/java/com/samskivert/util/IntMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/IntMaps.java b/src/main/java/com/samskivert/util/IntMaps.java
index 3ab5a356..eb109ce3 100644
--- a/src/main/java/com/samskivert/util/IntMaps.java
+++ b/src/main/java/com/samskivert/util/IntMaps.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/IntResultListener.java b/src/main/java/com/samskivert/util/IntResultListener.java
index 159057a4..9a121672 100644
--- a/src/main/java/com/samskivert/util/IntResultListener.java
+++ b/src/main/java/com/samskivert/util/IntResultListener.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/IntSet.java b/src/main/java/com/samskivert/util/IntSet.java
index 49a28878..048ee6ea 100644
--- a/src/main/java/com/samskivert/util/IntSet.java
+++ b/src/main/java/com/samskivert/util/IntSet.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/IntSets.java b/src/main/java/com/samskivert/util/IntSets.java
index 00708df7..b28936dc 100644
--- a/src/main/java/com/samskivert/util/IntSets.java
+++ b/src/main/java/com/samskivert/util/IntSets.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/IntTuple.java b/src/main/java/com/samskivert/util/IntTuple.java
index 5ad22450..8343ffbc 100644
--- a/src/main/java/com/samskivert/util/IntTuple.java
+++ b/src/main/java/com/samskivert/util/IntTuple.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Interable.java b/src/main/java/com/samskivert/util/Interable.java
index 085cbbd2..613f81d3 100644
--- a/src/main/java/com/samskivert/util/Interable.java
+++ b/src/main/java/com/samskivert/util/Interable.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Interator.java b/src/main/java/com/samskivert/util/Interator.java
index 2bfb1d7e..0a6c2345 100644
--- a/src/main/java/com/samskivert/util/Interator.java
+++ b/src/main/java/com/samskivert/util/Interator.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Interval.java b/src/main/java/com/samskivert/util/Interval.java
index c9b8a911..f29430be 100644
--- a/src/main/java/com/samskivert/util/Interval.java
+++ b/src/main/java/com/samskivert/util/Interval.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Invoker.java b/src/main/java/com/samskivert/util/Invoker.java
index 079eb830..b794d4ca 100644
--- a/src/main/java/com/samskivert/util/Invoker.java
+++ b/src/main/java/com/samskivert/util/Invoker.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/JDK14Logger.java b/src/main/java/com/samskivert/util/JDK14Logger.java
index 207ccbd5..6f2d4738 100644
--- a/src/main/java/com/samskivert/util/JDK14Logger.java
+++ b/src/main/java/com/samskivert/util/JDK14Logger.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/KeyUtil.java b/src/main/java/com/samskivert/util/KeyUtil.java
index f9479dbf..f7a64a82 100644
--- a/src/main/java/com/samskivert/util/KeyUtil.java
+++ b/src/main/java/com/samskivert/util/KeyUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/KeyValue.java b/src/main/java/com/samskivert/util/KeyValue.java
index bdb1f2bb..544ec8f1 100644
--- a/src/main/java/com/samskivert/util/KeyValue.java
+++ b/src/main/java/com/samskivert/util/KeyValue.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/LRUHashMap.java b/src/main/java/com/samskivert/util/LRUHashMap.java
index 4a9e9fc2..f76fbabf 100644
--- a/src/main/java/com/samskivert/util/LRUHashMap.java
+++ b/src/main/java/com/samskivert/util/LRUHashMap.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Lifecycle.java b/src/main/java/com/samskivert/util/Lifecycle.java
index fbf93ef1..19ee5942 100644
--- a/src/main/java/com/samskivert/util/Lifecycle.java
+++ b/src/main/java/com/samskivert/util/Lifecycle.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ListUtil.java b/src/main/java/com/samskivert/util/ListUtil.java
index 1b25dc3c..61818c7e 100644
--- a/src/main/java/com/samskivert/util/ListUtil.java
+++ b/src/main/java/com/samskivert/util/ListUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Log.java b/src/main/java/com/samskivert/util/Log.java
index 3852331b..40af2986 100644
--- a/src/main/java/com/samskivert/util/Log.java
+++ b/src/main/java/com/samskivert/util/Log.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Log4JLogger.java b/src/main/java/com/samskivert/util/Log4JLogger.java
index de93f9d7..76e30d42 100644
--- a/src/main/java/com/samskivert/util/Log4JLogger.java
+++ b/src/main/java/com/samskivert/util/Log4JLogger.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/LogBuilder.java b/src/main/java/com/samskivert/util/LogBuilder.java
index 193072d5..3e5167fc 100644
--- a/src/main/java/com/samskivert/util/LogBuilder.java
+++ b/src/main/java/com/samskivert/util/LogBuilder.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/LogProvider.java b/src/main/java/com/samskivert/util/LogProvider.java
index bf4851b4..359f1892 100644
--- a/src/main/java/com/samskivert/util/LogProvider.java
+++ b/src/main/java/com/samskivert/util/LogProvider.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Logger.java b/src/main/java/com/samskivert/util/Logger.java
index bb33c9a2..6db33ed2 100644
--- a/src/main/java/com/samskivert/util/Logger.java
+++ b/src/main/java/com/samskivert/util/Logger.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/LoggingLogProvider.java b/src/main/java/com/samskivert/util/LoggingLogProvider.java
index d3cce832..1e6ac4f3 100644
--- a/src/main/java/com/samskivert/util/LoggingLogProvider.java
+++ b/src/main/java/com/samskivert/util/LoggingLogProvider.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/LoopingThread.java b/src/main/java/com/samskivert/util/LoopingThread.java
index f04504fe..338905ff 100644
--- a/src/main/java/com/samskivert/util/LoopingThread.java
+++ b/src/main/java/com/samskivert/util/LoopingThread.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/MapEntry.java b/src/main/java/com/samskivert/util/MapEntry.java
index baa0417e..8a3473af 100644
--- a/src/main/java/com/samskivert/util/MapEntry.java
+++ b/src/main/java/com/samskivert/util/MapEntry.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Mapping.java b/src/main/java/com/samskivert/util/Mapping.java
index 2e01cbb9..648c5667 100644
--- a/src/main/java/com/samskivert/util/Mapping.java
+++ b/src/main/java/com/samskivert/util/Mapping.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/MethodFinder.java b/src/main/java/com/samskivert/util/MethodFinder.java
index c16690bb..afb5ab5a 100644
--- a/src/main/java/com/samskivert/util/MethodFinder.java
+++ b/src/main/java/com/samskivert/util/MethodFinder.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/MissingPropertyException.java b/src/main/java/com/samskivert/util/MissingPropertyException.java
index ba721ed9..59a76aa8 100644
--- a/src/main/java/com/samskivert/util/MissingPropertyException.java
+++ b/src/main/java/com/samskivert/util/MissingPropertyException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Multex.java b/src/main/java/com/samskivert/util/Multex.java
index 02870bad..4ab62a30 100644
--- a/src/main/java/com/samskivert/util/Multex.java
+++ b/src/main/java/com/samskivert/util/Multex.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ObjectUtil.java b/src/main/java/com/samskivert/util/ObjectUtil.java
index dafa8443..5e6c6093 100644
--- a/src/main/java/com/samskivert/util/ObjectUtil.java
+++ b/src/main/java/com/samskivert/util/ObjectUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ObserverList.java b/src/main/java/com/samskivert/util/ObserverList.java
index a2fe7c9c..83cfbdb1 100644
--- a/src/main/java/com/samskivert/util/ObserverList.java
+++ b/src/main/java/com/samskivert/util/ObserverList.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/OneLineLogFormatter.java b/src/main/java/com/samskivert/util/OneLineLogFormatter.java
index ded80097..5aed537c 100644
--- a/src/main/java/com/samskivert/util/OneLineLogFormatter.java
+++ b/src/main/java/com/samskivert/util/OneLineLogFormatter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Predicate.java b/src/main/java/com/samskivert/util/Predicate.java
index a152e344..5e4d6cfa 100644
--- a/src/main/java/com/samskivert/util/Predicate.java
+++ b/src/main/java/com/samskivert/util/Predicate.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/PrefsConfig.java b/src/main/java/com/samskivert/util/PrefsConfig.java
index d259fa8c..2f1e0fef 100644
--- a/src/main/java/com/samskivert/util/PrefsConfig.java
+++ b/src/main/java/com/samskivert/util/PrefsConfig.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ProcessLogger.java b/src/main/java/com/samskivert/util/ProcessLogger.java
index 1e9e865c..0dcbab3d 100644
--- a/src/main/java/com/samskivert/util/ProcessLogger.java
+++ b/src/main/java/com/samskivert/util/ProcessLogger.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/PropertiesUtil.java b/src/main/java/com/samskivert/util/PropertiesUtil.java
index e4738550..ba10b6a6 100644
--- a/src/main/java/com/samskivert/util/PropertiesUtil.java
+++ b/src/main/java/com/samskivert/util/PropertiesUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Queue.java b/src/main/java/com/samskivert/util/Queue.java
index 083910dc..c7f8b5ef 100644
--- a/src/main/java/com/samskivert/util/Queue.java
+++ b/src/main/java/com/samskivert/util/Queue.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/QuickSort.java b/src/main/java/com/samskivert/util/QuickSort.java
index 031979e2..a063ea04 100644
--- a/src/main/java/com/samskivert/util/QuickSort.java
+++ b/src/main/java/com/samskivert/util/QuickSort.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/RandomUtil.java b/src/main/java/com/samskivert/util/RandomUtil.java
index 1294f622..1ac975b9 100644
--- a/src/main/java/com/samskivert/util/RandomUtil.java
+++ b/src/main/java/com/samskivert/util/RandomUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Randoms.java b/src/main/java/com/samskivert/util/Randoms.java
index 162c2bd2..910b5388 100644
--- a/src/main/java/com/samskivert/util/Randoms.java
+++ b/src/main/java/com/samskivert/util/Randoms.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/RecentList.java b/src/main/java/com/samskivert/util/RecentList.java
index 9a4dc7ea..cdda7735 100644
--- a/src/main/java/com/samskivert/util/RecentList.java
+++ b/src/main/java/com/samskivert/util/RecentList.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/RepeatCallTracker.java b/src/main/java/com/samskivert/util/RepeatCallTracker.java
index 2c5cbdf4..8c00c428 100644
--- a/src/main/java/com/samskivert/util/RepeatCallTracker.java
+++ b/src/main/java/com/samskivert/util/RepeatCallTracker.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/RepeatRecordFilter.java b/src/main/java/com/samskivert/util/RepeatRecordFilter.java
index 25bc2d28..899ad9da 100644
--- a/src/main/java/com/samskivert/util/RepeatRecordFilter.java
+++ b/src/main/java/com/samskivert/util/RepeatRecordFilter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ResultHandler.java b/src/main/java/com/samskivert/util/ResultHandler.java
index 2cc086ed..245a4e82 100644
--- a/src/main/java/com/samskivert/util/ResultHandler.java
+++ b/src/main/java/com/samskivert/util/ResultHandler.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ResultListener.java b/src/main/java/com/samskivert/util/ResultListener.java
index 9ffa32d5..af7b208e 100644
--- a/src/main/java/com/samskivert/util/ResultListener.java
+++ b/src/main/java/com/samskivert/util/ResultListener.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ResultListenerList.java b/src/main/java/com/samskivert/util/ResultListenerList.java
index ec354edd..b005b7bd 100644
--- a/src/main/java/com/samskivert/util/ResultListenerList.java
+++ b/src/main/java/com/samskivert/util/ResultListenerList.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/RunAnywhere.java b/src/main/java/com/samskivert/util/RunAnywhere.java
index 7a777558..48edfbde 100644
--- a/src/main/java/com/samskivert/util/RunAnywhere.java
+++ b/src/main/java/com/samskivert/util/RunAnywhere.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/RunQueue.java b/src/main/java/com/samskivert/util/RunQueue.java
index 424e46ea..781b7d9a 100644
--- a/src/main/java/com/samskivert/util/RunQueue.java
+++ b/src/main/java/com/samskivert/util/RunQueue.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Runnables.java b/src/main/java/com/samskivert/util/Runnables.java
index 6e8d932b..1d74aa0f 100644
--- a/src/main/java/com/samskivert/util/Runnables.java
+++ b/src/main/java/com/samskivert/util/Runnables.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/SerialExecutor.java b/src/main/java/com/samskivert/util/SerialExecutor.java
index 14b36f85..29220ae0 100644
--- a/src/main/java/com/samskivert/util/SerialExecutor.java
+++ b/src/main/java/com/samskivert/util/SerialExecutor.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ServiceUnavailableException.java b/src/main/java/com/samskivert/util/ServiceUnavailableException.java
index 3579163d..fb9b3e9e 100644
--- a/src/main/java/com/samskivert/util/ServiceUnavailableException.java
+++ b/src/main/java/com/samskivert/util/ServiceUnavailableException.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ServiceWaiter.java b/src/main/java/com/samskivert/util/ServiceWaiter.java
index fd185489..d8be633f 100644
--- a/src/main/java/com/samskivert/util/ServiceWaiter.java
+++ b/src/main/java/com/samskivert/util/ServiceWaiter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ShortestPath.java b/src/main/java/com/samskivert/util/ShortestPath.java
index e3ac7aab..b6d747a0 100644
--- a/src/main/java/com/samskivert/util/ShortestPath.java
+++ b/src/main/java/com/samskivert/util/ShortestPath.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/SignalUtil.java b/src/main/java/com/samskivert/util/SignalUtil.java
index 41a9fc76..b7a68d20 100644
--- a/src/main/java/com/samskivert/util/SignalUtil.java
+++ b/src/main/java/com/samskivert/util/SignalUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/SoftCache.java b/src/main/java/com/samskivert/util/SoftCache.java
index 48b3afde..59c32421 100644
--- a/src/main/java/com/samskivert/util/SoftCache.java
+++ b/src/main/java/com/samskivert/util/SoftCache.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/SortableArrayList.java b/src/main/java/com/samskivert/util/SortableArrayList.java
index f96c850b..3232f9d8 100644
--- a/src/main/java/com/samskivert/util/SortableArrayList.java
+++ b/src/main/java/com/samskivert/util/SortableArrayList.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/StringUtil.java b/src/main/java/com/samskivert/util/StringUtil.java
index 88385983..35842cb8 100644
--- a/src/main/java/com/samskivert/util/StringUtil.java
+++ b/src/main/java/com/samskivert/util/StringUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/SystemInfo.java b/src/main/java/com/samskivert/util/SystemInfo.java
index 227ac29a..3aa324c2 100644
--- a/src/main/java/com/samskivert/util/SystemInfo.java
+++ b/src/main/java/com/samskivert/util/SystemInfo.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/TermUtil.java b/src/main/java/com/samskivert/util/TermUtil.java
index f25ffc2f..42b25f45 100644
--- a/src/main/java/com/samskivert/util/TermUtil.java
+++ b/src/main/java/com/samskivert/util/TermUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/TerseLogFormatter.java b/src/main/java/com/samskivert/util/TerseLogFormatter.java
index a8ea0d3d..067663ce 100644
--- a/src/main/java/com/samskivert/util/TerseLogFormatter.java
+++ b/src/main/java/com/samskivert/util/TerseLogFormatter.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Throttle.java b/src/main/java/com/samskivert/util/Throttle.java
index 7c564985..806d6d65 100644
--- a/src/main/java/com/samskivert/util/Throttle.java
+++ b/src/main/java/com/samskivert/util/Throttle.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Triple.java b/src/main/java/com/samskivert/util/Triple.java
index 621a038f..6fdc94e0 100644
--- a/src/main/java/com/samskivert/util/Triple.java
+++ b/src/main/java/com/samskivert/util/Triple.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/Tuple.java b/src/main/java/com/samskivert/util/Tuple.java
index f3a906fb..a6f533a9 100644
--- a/src/main/java/com/samskivert/util/Tuple.java
+++ b/src/main/java/com/samskivert/util/Tuple.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/ValueMarshaller.java b/src/main/java/com/samskivert/util/ValueMarshaller.java
index 5b45d4d2..65cd8f51 100644
--- a/src/main/java/com/samskivert/util/ValueMarshaller.java
+++ b/src/main/java/com/samskivert/util/ValueMarshaller.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/WeakObserverList.java b/src/main/java/com/samskivert/util/WeakObserverList.java
index be889378..a478a9fa 100644
--- a/src/main/java/com/samskivert/util/WeakObserverList.java
+++ b/src/main/java/com/samskivert/util/WeakObserverList.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/util/package.html b/src/main/java/com/samskivert/util/package.html
index 50ad99b7..53ed23af 100644
--- a/src/main/java/com/samskivert/util/package.html
+++ b/src/main/java/com/samskivert/util/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/08/12 01:34:31 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/velocity/Application.java b/src/main/java/com/samskivert/velocity/Application.java
index 78832498..995f06ba 100644
--- a/src/main/java/com/samskivert/velocity/Application.java
+++ b/src/main/java/com/samskivert/velocity/Application.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/ClasspathResourceLoader.java b/src/main/java/com/samskivert/velocity/ClasspathResourceLoader.java
index 7d30665b..c135118e 100644
--- a/src/main/java/com/samskivert/velocity/ClasspathResourceLoader.java
+++ b/src/main/java/com/samskivert/velocity/ClasspathResourceLoader.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/CurrencyTool.java b/src/main/java/com/samskivert/velocity/CurrencyTool.java
index a14930ba..5222128b 100644
--- a/src/main/java/com/samskivert/velocity/CurrencyTool.java
+++ b/src/main/java/com/samskivert/velocity/CurrencyTool.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/DataTool.java b/src/main/java/com/samskivert/velocity/DataTool.java
index 9dd356b4..6477605e 100644
--- a/src/main/java/com/samskivert/velocity/DataTool.java
+++ b/src/main/java/com/samskivert/velocity/DataTool.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/DispatcherServlet.java b/src/main/java/com/samskivert/velocity/DispatcherServlet.java
index 38609cbc..a506213b 100644
--- a/src/main/java/com/samskivert/velocity/DispatcherServlet.java
+++ b/src/main/java/com/samskivert/velocity/DispatcherServlet.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/DummyLogic.java b/src/main/java/com/samskivert/velocity/DummyLogic.java
index 76278df4..238e7ae4 100644
--- a/src/main/java/com/samskivert/velocity/DummyLogic.java
+++ b/src/main/java/com/samskivert/velocity/DummyLogic.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/FormTool.java b/src/main/java/com/samskivert/velocity/FormTool.java
index 9dd6abe4..02dd8f5b 100644
--- a/src/main/java/com/samskivert/velocity/FormTool.java
+++ b/src/main/java/com/samskivert/velocity/FormTool.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/I18nTool.java b/src/main/java/com/samskivert/velocity/I18nTool.java
index e3348a67..8d4521dc 100644
--- a/src/main/java/com/samskivert/velocity/I18nTool.java
+++ b/src/main/java/com/samskivert/velocity/I18nTool.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/ImportDirective.java b/src/main/java/com/samskivert/velocity/ImportDirective.java
index 85b383fd..8d43b9b5 100644
--- a/src/main/java/com/samskivert/velocity/ImportDirective.java
+++ b/src/main/java/com/samskivert/velocity/ImportDirective.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/InvocationContext.java b/src/main/java/com/samskivert/velocity/InvocationContext.java
index 2cc92778..5cd5d772 100644
--- a/src/main/java/com/samskivert/velocity/InvocationContext.java
+++ b/src/main/java/com/samskivert/velocity/InvocationContext.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/Logic.java b/src/main/java/com/samskivert/velocity/Logic.java
index 4c6af14b..9205e46b 100644
--- a/src/main/java/com/samskivert/velocity/Logic.java
+++ b/src/main/java/com/samskivert/velocity/Logic.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/ServletContextLogger.java b/src/main/java/com/samskivert/velocity/ServletContextLogger.java
index 66b4421a..39b59a9c 100644
--- a/src/main/java/com/samskivert/velocity/ServletContextLogger.java
+++ b/src/main/java/com/samskivert/velocity/ServletContextLogger.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java b/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java
index ae4a393e..b4f98563 100644
--- a/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java
+++ b/src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/ServletContextResourceManager.java b/src/main/java/com/samskivert/velocity/ServletContextResourceManager.java
index 9c07ba59..08d03801 100644
--- a/src/main/java/com/samskivert/velocity/ServletContextResourceManager.java
+++ b/src/main/java/com/samskivert/velocity/ServletContextResourceManager.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java b/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java
index 22d4000a..a0ad5fdb 100644
--- a/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java
+++ b/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/SiteKey.java b/src/main/java/com/samskivert/velocity/SiteKey.java
index 2916aeab..1e76d6d7 100644
--- a/src/main/java/com/samskivert/velocity/SiteKey.java
+++ b/src/main/java/com/samskivert/velocity/SiteKey.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/SiteResourceManager.java b/src/main/java/com/samskivert/velocity/SiteResourceManager.java
index c8ab7f31..52fbadd3 100644
--- a/src/main/java/com/samskivert/velocity/SiteResourceManager.java
+++ b/src/main/java/com/samskivert/velocity/SiteResourceManager.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/StringTool.java b/src/main/java/com/samskivert/velocity/StringTool.java
index 27ca20df..672cc7fc 100644
--- a/src/main/java/com/samskivert/velocity/StringTool.java
+++ b/src/main/java/com/samskivert/velocity/StringTool.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/VelocityUtil.java b/src/main/java/com/samskivert/velocity/VelocityUtil.java
index f71fee9c..55aff40a 100644
--- a/src/main/java/com/samskivert/velocity/VelocityUtil.java
+++ b/src/main/java/com/samskivert/velocity/VelocityUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/velocity/package.html b/src/main/java/com/samskivert/velocity/package.html
index a140df3e..f03a7930 100644
--- a/src/main/java/com/samskivert/velocity/package.html
+++ b/src/main/java/com/samskivert/velocity/package.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: package.html,v 1.1 2001/10/31 09:44:22 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/java/com/samskivert/xml/CallMethodSpecialRule.java b/src/main/java/com/samskivert/xml/CallMethodSpecialRule.java
index 1b3a2c1b..20015d69 100644
--- a/src/main/java/com/samskivert/xml/CallMethodSpecialRule.java
+++ b/src/main/java/com/samskivert/xml/CallMethodSpecialRule.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/xml/CheckVersionRule.java b/src/main/java/com/samskivert/xml/CheckVersionRule.java
index 1cfd356d..60dc5edb 100644
--- a/src/main/java/com/samskivert/xml/CheckVersionRule.java
+++ b/src/main/java/com/samskivert/xml/CheckVersionRule.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/xml/SetFieldRule.java b/src/main/java/com/samskivert/xml/SetFieldRule.java
index 686b528c..7694c879 100644
--- a/src/main/java/com/samskivert/xml/SetFieldRule.java
+++ b/src/main/java/com/samskivert/xml/SetFieldRule.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/xml/SetNextFieldRule.java b/src/main/java/com/samskivert/xml/SetNextFieldRule.java
index cb0c5694..6a5adc07 100644
--- a/src/main/java/com/samskivert/xml/SetNextFieldRule.java
+++ b/src/main/java/com/samskivert/xml/SetNextFieldRule.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/xml/SetPropertyFieldsRule.java b/src/main/java/com/samskivert/xml/SetPropertyFieldsRule.java
index 6507ede5..30e2367f 100644
--- a/src/main/java/com/samskivert/xml/SetPropertyFieldsRule.java
+++ b/src/main/java/com/samskivert/xml/SetPropertyFieldsRule.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/xml/SimpleParser.java b/src/main/java/com/samskivert/xml/SimpleParser.java
index 4260d327..bb94e46c 100644
--- a/src/main/java/com/samskivert/xml/SimpleParser.java
+++ b/src/main/java/com/samskivert/xml/SimpleParser.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/xml/ValidatedSetNextRule.java b/src/main/java/com/samskivert/xml/ValidatedSetNextRule.java
index acb085ad..2bc506c3 100644
--- a/src/main/java/com/samskivert/xml/ValidatedSetNextRule.java
+++ b/src/main/java/com/samskivert/xml/ValidatedSetNextRule.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/xml/XMLUtil.java b/src/main/java/com/samskivert/xml/XMLUtil.java
index de93d31b..32798f57 100644
--- a/src/main/java/com/samskivert/xml/XMLUtil.java
+++ b/src/main/java/com/samskivert/xml/XMLUtil.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/main/java/com/samskivert/xml/package.html b/src/main/java/com/samskivert/xml/package.html
index d7cfc7f3..29c39514 100644
--- a/src/main/java/com/samskivert/xml/package.html
+++ b/src/main/java/com/samskivert/xml/package.html
@@ -3,10 +3,8 @@
   <head>
     <!--
 
-    $Id: package.html,v 1.2 2001/11/17 03:45:02 mdb Exp $
-
     samskivert library - useful routines for java programs
-    Copyright (C) 2001 Michael Bayne
+    Copyright (C) 2001-2011 Michael Bayne, et al.
     
     This library is free software; you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index 0560ce2a..040bdfbf 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -3,10 +3,8 @@
 <head>
 <!--
 
-  $Id: overview.html,v 1.1 2001/08/12 01:45:46 mdb Exp $
-
   samskivert library - useful routines for java programs
-  Copyright (C) 2001 Michael Bayne
+  Copyright (C) 2001-2011 Michael Bayne, et al.
  
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published
diff --git a/src/main/resources/com/samskivert/Utils.gwt.xml b/src/main/resources/com/samskivert/Utils.gwt.xml
index b78ab42f..1317fcc9 100644
--- a/src/main/resources/com/samskivert/Utils.gwt.xml
+++ b/src/main/resources/com/samskivert/Utils.gwt.xml
@@ -1,4 +1,3 @@
-<!-- $Id$                                          -->
 <!-- Exports various samskivert utilities to GWT.  -->
 <module>
   <source path="text"/>
diff --git a/src/main/sql/create_site_tables.mysql b/src/main/sql/create_site_tables.mysql
index 782e7867..406a860a 100644
--- a/src/main/sql/create_site_tables.mysql
+++ b/src/main/sql/create_site_tables.mysql
@@ -1,6 +1,4 @@
 /**
- * $Id: create_site_tables.mysql,v 1.2 2003/11/13 16:57:47 mdb Exp $
- *
  * Creates the necessary database tables in MySQL for the JDBC table site
  * identifier.
  */
diff --git a/src/main/sql/create_user_tables.mysql b/src/main/sql/create_user_tables.mysql
index ed0046f7..7e46a3cf 100644
--- a/src/main/sql/create_user_tables.mysql
+++ b/src/main/sql/create_user_tables.mysql
@@ -1,6 +1,4 @@
 /**
- * $Id: create_user_tables.mysql,v 1.3 2001/11/01 01:49:12 mdb Exp $
- *
  * Creates the necessary database tables in MySQL for the user repository.
  */
 
diff --git a/src/test/java/com/samskivert/io/StreamUtilTest.java b/src/test/java/com/samskivert/io/StreamUtilTest.java
index cc17f86b..764136f4 100644
--- a/src/test/java/com/samskivert/io/StreamUtilTest.java
+++ b/src/test/java/com/samskivert/io/StreamUtilTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java b/src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java
index e02242e5..594ee55b 100644
--- a/src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java
+++ b/src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java b/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
index ab8da81f..6d99deb7 100644
--- a/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
+++ b/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/swing/AdjustTestApp.java b/src/test/java/com/samskivert/swing/AdjustTestApp.java
index ae1f4a71..825bdd22 100644
--- a/src/test/java/com/samskivert/swing/AdjustTestApp.java
+++ b/src/test/java/com/samskivert/swing/AdjustTestApp.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/swing/LabelDemo.java b/src/test/java/com/samskivert/swing/LabelDemo.java
index 6a2f9616..8a38be36 100644
--- a/src/test/java/com/samskivert/swing/LabelDemo.java
+++ b/src/test/java/com/samskivert/swing/LabelDemo.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/swing/ProximityTrackerTest.java b/src/test/java/com/samskivert/swing/ProximityTrackerTest.java
index cfeb39c8..80101a73 100644
--- a/src/test/java/com/samskivert/swing/ProximityTrackerTest.java
+++ b/src/test/java/com/samskivert/swing/ProximityTrackerTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/swing/TestComboButtonBox.java b/src/test/java/com/samskivert/swing/TestComboButtonBox.java
index 8b738d91..8ad0284e 100644
--- a/src/test/java/com/samskivert/swing/TestComboButtonBox.java
+++ b/src/test/java/com/samskivert/swing/TestComboButtonBox.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/ArrayIntSetTest.java b/src/test/java/com/samskivert/util/ArrayIntSetTest.java
index 93f80c8d..e8b50a81 100644
--- a/src/test/java/com/samskivert/util/ArrayIntSetTest.java
+++ b/src/test/java/com/samskivert/util/ArrayIntSetTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/ArrayUtilTest.java b/src/test/java/com/samskivert/util/ArrayUtilTest.java
index 04f06ff6..d479bfa0 100644
--- a/src/test/java/com/samskivert/util/ArrayUtilTest.java
+++ b/src/test/java/com/samskivert/util/ArrayUtilTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/CheapIntMapTest.java b/src/test/java/com/samskivert/util/CheapIntMapTest.java
index 0162f8cf..d20089af 100644
--- a/src/test/java/com/samskivert/util/CheapIntMapTest.java
+++ b/src/test/java/com/samskivert/util/CheapIntMapTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/CollectionUtilTest.java b/src/test/java/com/samskivert/util/CollectionUtilTest.java
index 161e5441..5fe4c4bd 100644
--- a/src/test/java/com/samskivert/util/CollectionUtilTest.java
+++ b/src/test/java/com/samskivert/util/CollectionUtilTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/ConfigTest.java b/src/test/java/com/samskivert/util/ConfigTest.java
index 9db37ee3..af6638eb 100644
--- a/src/test/java/com/samskivert/util/ConfigTest.java
+++ b/src/test/java/com/samskivert/util/ConfigTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/ConfigUtilTest.java b/src/test/java/com/samskivert/util/ConfigUtilTest.java
index 74453938..0f53d6b1 100644
--- a/src/test/java/com/samskivert/util/ConfigUtilTest.java
+++ b/src/test/java/com/samskivert/util/ConfigUtilTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/FoldsTest.java b/src/test/java/com/samskivert/util/FoldsTest.java
index 4e0a3547..4ae7e4ca 100644
--- a/src/test/java/com/samskivert/util/FoldsTest.java
+++ b/src/test/java/com/samskivert/util/FoldsTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/HashIntMapTest.java b/src/test/java/com/samskivert/util/HashIntMapTest.java
index 631e0bc3..be98c748 100644
--- a/src/test/java/com/samskivert/util/HashIntMapTest.java
+++ b/src/test/java/com/samskivert/util/HashIntMapTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/HashIntSetTest.java b/src/test/java/com/samskivert/util/HashIntSetTest.java
index 1756fe15..5084695b 100644
--- a/src/test/java/com/samskivert/util/HashIntSetTest.java
+++ b/src/test/java/com/samskivert/util/HashIntSetTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/IntListUtilTest.java b/src/test/java/com/samskivert/util/IntListUtilTest.java
index 933c763d..829fa65f 100644
--- a/src/test/java/com/samskivert/util/IntListUtilTest.java
+++ b/src/test/java/com/samskivert/util/IntListUtilTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/IntSetTestBase.java b/src/test/java/com/samskivert/util/IntSetTestBase.java
index fb9d54b5..72c5c46d 100644
--- a/src/test/java/com/samskivert/util/IntSetTestBase.java
+++ b/src/test/java/com/samskivert/util/IntSetTestBase.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/LRUHashMapTest.java b/src/test/java/com/samskivert/util/LRUHashMapTest.java
index 899a1803..01fc2bec 100644
--- a/src/test/java/com/samskivert/util/LRUHashMapTest.java
+++ b/src/test/java/com/samskivert/util/LRUHashMapTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/ObserverListTest.java b/src/test/java/com/samskivert/util/ObserverListTest.java
index 39efed00..ee75000a 100644
--- a/src/test/java/com/samskivert/util/ObserverListTest.java
+++ b/src/test/java/com/samskivert/util/ObserverListTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/QuickSortTest.java b/src/test/java/com/samskivert/util/QuickSortTest.java
index 9610db62..d91ac053 100644
--- a/src/test/java/com/samskivert/util/QuickSortTest.java
+++ b/src/test/java/com/samskivert/util/QuickSortTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/RunnablesTest.java b/src/test/java/com/samskivert/util/RunnablesTest.java
index e199a541..2bd02970 100644
--- a/src/test/java/com/samskivert/util/RunnablesTest.java
+++ b/src/test/java/com/samskivert/util/RunnablesTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/SerialExecutorTest.java b/src/test/java/com/samskivert/util/SerialExecutorTest.java
index decaf2b9..179e33d2 100644
--- a/src/test/java/com/samskivert/util/SerialExecutorTest.java
+++ b/src/test/java/com/samskivert/util/SerialExecutorTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/StringUtilTest.java b/src/test/java/com/samskivert/util/StringUtilTest.java
index 7ee95b5a..296a4195 100644
--- a/src/test/java/com/samskivert/util/StringUtilTest.java
+++ b/src/test/java/com/samskivert/util/StringUtilTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/SystemInfoDemo.java b/src/test/java/com/samskivert/util/SystemInfoDemo.java
index ddbfab58..badd1e52 100644
--- a/src/test/java/com/samskivert/util/SystemInfoDemo.java
+++ b/src/test/java/com/samskivert/util/SystemInfoDemo.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/util/ThrottleTest.java b/src/test/java/com/samskivert/util/ThrottleTest.java
index 020edb76..f2bed40c 100644
--- a/src/test/java/com/samskivert/util/ThrottleTest.java
+++ b/src/test/java/com/samskivert/util/ThrottleTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/velocity/VelocityTest.java b/src/test/java/com/samskivert/velocity/VelocityTest.java
index f149d66b..8c1c173b 100644
--- a/src/test/java/com/samskivert/velocity/VelocityTest.java
+++ b/src/test/java/com/samskivert/velocity/VelocityTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/java/com/samskivert/xml/SetFieldRuleTest.java b/src/test/java/com/samskivert/xml/SetFieldRuleTest.java
index dae06e95..4f3ffd17 100644
--- a/src/test/java/com/samskivert/xml/SetFieldRuleTest.java
+++ b/src/test/java/com/samskivert/xml/SetFieldRuleTest.java
@@ -1,6 +1,4 @@
 //
-// $Id$
-//
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001-2011 Michael Bayne, et al.
 //
diff --git a/src/test/resources/util/child.properties b/src/test/resources/util/child.properties
index 1f4024aa..7416e54c 100644
--- a/src/test/resources/util/child.properties
+++ b/src/test/resources/util/child.properties
@@ -1,6 +1,4 @@
 #
-# $Id: test.properties,v 1.3 2002/11/25 22:23:21 mdb Exp $
-#
 # A test properties file
 
 _extends = util/parent.properties
diff --git a/src/test/resources/util/grandparent.properties b/src/test/resources/util/grandparent.properties
index 6955ec29..ec3b4a5f 100644
--- a/src/test/resources/util/grandparent.properties
+++ b/src/test/resources/util/grandparent.properties
@@ -1,6 +1,4 @@
 #
-# $Id: grandparent.properties,v 1.1 2002/11/25 22:23:21 mdb Exp $
-#
 # A test properties file
 
 sub.sub1 = 5
diff --git a/src/test/resources/util/parent.properties b/src/test/resources/util/parent.properties
index 0abb0f60..b3f39b4a 100644
--- a/src/test/resources/util/parent.properties
+++ b/src/test/resources/util/parent.properties
@@ -1,6 +1,4 @@
 #
-# $Id: parent.properties,v 1.1 2002/11/25 22:23:21 mdb Exp $
-#
 # A test properties file
 
 _extends = util/grandparent.properties
diff --git a/src/test/resources/util/test.properties b/src/test/resources/util/test.properties
index 2f8ebbe7..2fc552ce 100644
--- a/src/test/resources/util/test.properties
+++ b/src/test/resources/util/test.properties
@@ -1,6 +1,4 @@
 #
-# $Id: test.properties,v 1.3 2002/11/25 22:23:21 mdb Exp $
-#
 # A test properties file
 
 sub.sub1 = 5