Merge branch 'CHEF-800' of git://github.com/nuoyan/chef into nuoyan/CHEF-800

Author: adamhjk

chef/lib/chef/search/query.rb

@@ -43,7 +43,7 @@ def search(type, query="*:*", sort=nil, start=0, rows=20, &block)
 
         response = @rest.get_rest("search/#{type}?q=#{escape(query)}&sort=#{escape(sort)}&start=#{escape(start)}&rows=#{escape(rows)}")
         if block
-          response["rows"].each { |o| block.call(o) }
+          response["rows"].each { |o| block.call(o) unless o.nil?}
           unless (response["start"] + response["rows"].length) >= response["total"]
             nstart = response["start"] + rows
             search(type, query, sort, nstart, rows, &block)