Merge branch 'upstream-fixes'

This commit is contained in:
John W. Linville 2006-02-17 08:15:58 -05:00
commit 5b69e69d4e