Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 May 2006 20:12:24 +0000 (16:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 May 2006 20:12:24 +0000 (16:12 -0400)
commitb1141f6d5dead296adcabd4a1e8ea2b994e287cb
treed943fdb68114edcf67223659764ef458860eebbd
parentf587fb74b26a10354f1eb73e8d054cd15e5a2fe2
parent4541a5db0ba33d9c692e5b2f8d7805e336fabe7c
Merge branch 'upstream-fixes' into upstream