caps and num lock inverted??

New mac book pro just arrived. the caps and num lock are the wrong way round (lower case when caps lock on and row of numbers only active when num lock on) It's already caused problems with case sensitive passwords etc. Does anyone know how to fix this? Thanks

My month old mac book pro is having the same problem. I had to reboot and it went away... but I'm hoping it doesn't recur. Did you find any solution?