Manual merge with Linus
authorDmitry Torokhov <dtor_core@ameritech.net>
Sat, 10 Sep 2005 01:14:47 +0000 (20:14 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Sat, 10 Sep 2005 01:14:47 +0000 (20:14 -0500)

Trivial merge