For the benefit of those that are from New Zealand here is the DIY guide to home wiring put out by the Energy Saftey NZ (govt organisation). It includes instruction and diagrams on wiring 2 way switching.
http://www.energysafety.govt.nz/upload/33458/ecp51v18.pdf
Remember this is only for...