forward-port of Tobias Ulmers patch
forward-port of Tobias Ulmers patch


bwhmather/wmii,sunaku/wmii,0intro/wmii,bwhmather/wmii,sunaku/wmii,0intro/wmii,0intro/wmii,sunaku/wmii,bwhmather/wmii,0intro/wmii,bwhmather/wmii,bwhmather/wmii,sunaku/wmii,sunaku/wmii