Merge branch 'speedy-index' into next

Conflicts:

	lib/sup/poll.rb

diff --cc lib/sup/index.rb
Simple merge

diff --cc lib/sup/poll.rb
index d32c893e76771873832595ec95c67fac0780a208,09f5de3898e57c2d683ae9756ac3700c9473ccb3..87cf9963796286f73a92f87478c207e23300cfa0
--- 1/lib/sup/poll.rb
--- 2/lib/sup/poll.rb
+++ b/lib/sup/poll.rb
@@@ -156,8 -156,8 +156,8 @@@ EO
  
            docid, entry = Index.load_entry_for_id m.id
            HookManager.run "before-add-message", :message => m
 -          m = yield(m, offset, entry) or next
 +          m = yield(m, offset, entry) or next if block_given?
-           Index.sync_message m, docid, entry
+           Index.sync_message m, docid, entry, opts
            UpdateManager.relay self, :added, m unless entry
          rescue MessageFormatError => e
            Redwood::log "ignoring erroneous message at #{source}##{offset}: #{e.message}"