Merge by hand (conflicts in sd.c)
authorJames Bottomley <jejb@titanic.(none)>
Tue, 6 Sep 2005 22:52:54 +0000 (17:52 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Tue, 6 Sep 2005 22:52:54 +0000 (17:52 -0500)

Trivial merge