Updated to 7.0 from http://plugins.svn.wordpress.org/search-everything/tags/7/
Merge branch '7.0'