Pushing my hoarded changes
Merge branch 'master' of http://github.com/ArchBSD/abs