816aeb1f068ade0349a22009ff7a66f25413
parent bc519f30eb039f023c15167663d5a8a14fed7dcb
author John W. Linville <linville@tuxdriver.com> 1147892049 -0400
committer John W. Linville <linville@tuxdriver.com> 1147892049 -0400

Merge branch 'upstream-fixes' into upstream
!6d