Merge by hand (conflicts in sr.c)
authorJames Bottomley <jejb@titanic.(none)>
Sun, 28 Aug 2005 16:40:00 +0000 (11:40 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Sun, 28 Aug 2005 16:40:00 +0000 (11:40 -0500)

Trivial merge