Replying to djcp:
Replying to nacin: As this is my first contribution to the wordpress core, I'm a little unsure of standards. Sorry! Should I make those change and re-upload?
Not a problem. Congrats on your first patch :-) If you can do that, that'd be great. Otherwise, I'll clean it up in about a month when 3.2 development gets underway.
If there's no patch on this ticket come 3.2 for that Andrea mentions, I'll port this over and get it handled there as well.