Merge branch 'master' of ssh://alanbrunelle@git.kernel.dk/data/git/blktrace
authorAlan D. Brunelle <alan.brunelle@hp.com>
Mon, 10 Nov 2008 15:34:02 +0000 (10:34 -0500)
committerAlan D. Brunelle <alan.brunelle@hp.com>
Mon, 10 Nov 2008 15:34:02 +0000 (10:34 -0500)

Trivial merge