John W. Linville <linville@tuxdriver.com> 1146862223 -0400
committer John W. Linville <linville@tuxdriver.com> 1146862223 -0400

Merge branch 'from-linus' into upstream
ƶ`[�