Log message: Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching error, and to sync with reality.