Merge change Ib3b06fc3 into eclair-mr2

* changes:
  It turns out to be useful to allow enumeration on a per-tag basis, and it's easy to support based on the data structures we have, so add a tag parameter to getNextEvent().