84141da87c74d5c
author John W. Linville <linville@tuxdriver.com> 1154027173 -0400
committer John W. Linville <linville@tuxdriver.com> 1154027173 -0400

Merge branch 'upstream-fixes' into upstream
¼Ýc‰ž