What's your favorite keyboard that has a Mac key layout?

So, I spilled water on my lovely Logitech s510 cordless desktop keyboard, and while most of it is working, a few keys are not.

Because of this, it appears that I am now in the market for a new keyboard. What’s out there that has a Mac keyboard layout but doesn’t come from Apple? I’ve looked at the Logitech DiNovo Mac Edition and it seems pretty nice. I’m wondering if there is anything else out there. I prefer wireless and a keyboard/mouse combo is always nice, but with the new Magic Mouse I may want to go with just a keyboard.