CSS: merge with ikiwiki style.css changes in Squeeze