Merge branch 'upstream-fixes' into upstream

This commit is contained in:
John W. Linville 2006-08-04 14:57:43 -04:00
commit 8b9411014e