Fix typo
Merge branch 'rpm5' of github.com:krytarowski/pkgsrc-2014Q1 into rpm5
Apply last patches