Merge branch 'upstream-fixes' into upstream
commit4c2be501b7e8695f8bdf4f7d5f51595ed55eea44
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Aug 2006 18:22:14 +0000 (23 14:22 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Aug 2006 18:22:14 +0000 (23 14:22 -0400)
treed111c2d4601c1e1bdbfbbd585afaee9a8be6f2a6
parent69758820a42da207bdc775d6eccf1f9fb67cd62e
parent9b5cce07648d059a013444116bd0140b047b25a1
Merge branch 'upstream-fixes' into upstream