am 484a065c: am 2a2805b7: Merge change Ib3b06fc3 into eclair-mr2

Merge commit '484a065ce325a1c1bf38627ff924516b25a02efb'

* commit '484a065ce325a1c1bf38627ff924516b25a02efb':
  It turns out to be useful to allow enumeration on a per-tag basis,