Comment 1 for bug 387897

This is obvious but you should merge trunk. As of 10 minutes ago, there are (easy to resolve) conflicts with Steve's merged app-mvhub/conf/templates/html/search_results.tmpl