Merge branch 'master' of ssh://alanbrunelle@git.kernel.dk/data/git/blktrace
authorAlan D. Brunelle <alan.brunelle@hp.com>
Fri, 10 Oct 2008 12:40:21 +0000 (08:40 -0400)
committerAlan D. Brunelle <alan.brunelle@hp.com>
Fri, 10 Oct 2008 12:40:21 +0000 (08:40 -0400)

Trivial merge