---
- branch: MAIN
  date: Thu Jun  4 02:57:01 UTC 2009
  files:
  - new: '1.8'
    old: '1.7'
    path: src/sbin/modload/main.c
    pathrev: src/sbin/modload/main.c@1.8
    type: modified
  - new: '1.32'
    old: '1.31'
    path: src/sbin/modload/modload.8
    pathrev: src/sbin/modload/modload.8@1.32
    type: modified
  id: 20090604T025701Z.3d1f6dc46c3e5cbb5291ba61853dba1c75dd50d9
  log: |
    Add a "-m plist" option.  This option will read in an existing
    <module>.prop file and merge any options supplied on the "command
    line".

    This code will serve as the basis for in-kernel merging.
  module: src
  subject: 'CVS commit: src/sbin/modload'
  unixtime: '1244084221'
  user: jnemeth