Apple single-button mouse

I really need to get off my duff a buy a two button mouse for my iMac. I can't stand the single button thing. Nothing deep about my dislike, I'm just so used to having two buttons. Just asked Shonali and she has the same problem. I wonder when Apple will start shipping Macs with two button mice out of the box? (heck, for all I know, they already do... remember, this iMac was a gift)