Mark bugs that are fixed in trunk as blockers of this one. These are possible candidates for the 2.1 branch.
2.1.1 has been released.