Hand merge.
authorJeff Garzik <jgarzik@mandrakesoft.com>
Wed, 6 Mar 2002 16:38:57 +0000 (11:38 -0500)
committerJeff Garzik <jgarzik@mandrakesoft.com>
Wed, 6 Mar 2002 16:38:57 +0000 (11:38 -0500)
commit4df7c015d721e3adfe030c6eac972d66ee510acb
tree6ef6487ed03b106fa80360d5d7109e35af704189
parenta925c40f775a179a971bfd77de8e3035c0afc1ac
parent5c6c0af0086c5eb27c59aab6f58a0e1940b221ef
Hand merge.