---
- branch: MAIN
  date: Sat Aug  7 05:53:21 UTC 2010
  files:
  - new: '1.10'
    old: '1.9'
    path: src/distrib/sets/lists/comp/ad.mips64eb
    pathrev: src/distrib/sets/lists/comp/ad.mips64eb@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/distrib/sets/lists/comp/ad.mips64el
    pathrev: src/distrib/sets/lists/comp/ad.mips64el@1.10
    type: modified
  - new: '1.73'
    old: '1.72'
    path: src/distrib/sets/lists/comp/md.amd64
    pathrev: src/distrib/sets/lists/comp/md.amd64@1.73
    type: modified
  - new: '1.62'
    old: '1.61'
    path: src/distrib/sets/lists/comp/md.sparc64
    pathrev: src/distrib/sets/lists/comp/md.sparc64@1.62
    type: modified
  - new: '1.1491'
    old: '1.1490'
    path: src/distrib/sets/lists/comp/mi
    pathrev: src/distrib/sets/lists/comp/mi@1.1491
    type: modified
  id: 20100807T055321Z.b59a22a9134b5cf55d04f127085098a171b1384f
  log: |
    merge conflicts

    this isn't how this was planned, but needed for releases to build. will
    be revisited later
  module: src
  subject: 'CVS commit: src/distrib/sets/lists/comp'
  unixtime: '1281160401'
  user: agc