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