Merge branch 'master' of git://brick.kernel.dk/data/git/blktrace
authorAlan D. Brunelle <adb@korik.(none)>
Fri, 5 Oct 2007 22:30:27 +0000 (18:30 -0400)
committerAlan D. Brunelle <adb@korik.(none)>
Fri, 5 Oct 2007 22:30:27 +0000 (18:30 -0400)

Trivial merge