Merge branch 'upstream-fixes' into upstream
commitf6882a0688ea83db5fc2f3491ac9fcdce0834cc7
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Jun 2006 19:31:57 +0000 (5 15:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Jun 2006 19:31:57 +0000 (5 15:31 -0400)
tree19a30d557610787dc0520a2955852b4882056bdb
parentdea58b80f2625d3712645fb6ff0af45866cedaae
parentea9a7719597e81a119a155178eabfc941eef11cc
Merge branch 'upstream-fixes' into upstream