>> Once David gives you a "Ship it!" feel free to merge both. > > I'm in favour, but I don't see a revised patch on reviewboard, if you want me > to review the fixed patch. Thanks both of you - should be a revised patch up now.