Miguel asked me to review this patch. This looks great to me. Please commit to both branches (iirc, you have already checked in test cases for both branches, good work) and close the bug. -- Ben