feels corner, consider yourself felt
Merge git://repo.or.cz/www