Merge branch 'for-linville' of git://github.com/kvalo/ath