Merge commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5' into eclair-mr2-plus-aosp * commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5': It turns out to be useful to allow enumeration on a per-tag basis,