Well "waiting on", to me, is used in the context of waiters serving. But I've never said "I'm waiting on a friend", I always say "waiting for a friend". Maybe how popular the phrase is depends on where you're from, but using "waiting on" in that kind of context sounds weird to me. :s
So, just for the sake of confusing you, I use the terms differently from one another. =P
