merge from HEAD (20040128)

there's a lot of confliction in portals/knals/qswnal/qswnal_cb.c, need
Eric Barton check it more.

diff --git a/lustre/tests/.RC_CURRENT.tag b/lustre/tests/.RC_CURRENT.tag
index 427e007..738c3ee 100644 (file)
--- a/lustre/tests/.RC_CURRENT.tag
+++ b/lustre/tests/.RC_CURRENT.tag
@@ -1 +1 @@
-RC_1_1_0_28
+RC_1_1_0_36