f61073af43991c3525c7267bd
parent 71bfe47f023c55c322607939b786ce0a44627dfc
parent 782a6675119c76c071e74e2ddd98268f47770cba
author John W. Linville <linville@tuxdriver.com> 1154717863 -0400
committer John W. Linville <linville@tuxdriver.com> 1154717863 -0400

Merge branch 'upstream-fixes' into upstream
–Īb‹ž