2.1 final tagging

[Nikolaj Hald Nielsen]

In general, of we are this close to tagging 2.1.0 final, we need to
stop committing new features, _now_. There is a reason for feature
freeze, even if we have not been overly strict with it.

This last big "expand search results" commit is a good example of why
a feature freeze is a good idea. IT breaks searching in Magnatune,
Jamendo and Podcast directory Services.

- Nikolaj