K 10
svn:author
V 3
jhb
K 8
svn:date
V 27
2008-08-07T15:39:15.222230Z
K 7
svn:log
V 292
- Partial metadata was comitted to say that 179933 was merged, but in
  fact it wasn't.  Fix this by removing the partial metadata.
- Consolidate some merge info.  This removes local merge info on kern.  It
  should remove it on sys/dev/ata as well, but svn isn't elliding for
  some reason.

END