I reverted 7379049d which solves the acute problem, but leave this bug for Andy to close once he has had time to re-introduce 7379049d the way he intended it.
- bug#74557: Bootstrap no longer working Mikael Djurfeldt
- bug#74557: Patch to get main bootstrapping again Mikael Djurfeldt
- bug#74557: Reverted 7379049d Mikael Djurfeldt
- bug#74557: Bootstrap no longer working Ludovic Courtès
- bug#74557: Reverted 7379049d Ludovic Courtès
