Contention Resolution in Multi-Fibre Optical Packet Switches