Weird whining noise
 

I've noticed it before, but now it just seems to be a little more noticeable. When im in a red light, and the car is on Drive, if i turn the steering wheel just a little, it makes a weird whining noise. It's not loud at all, especially in the cabin, its very hard to notice. Only i notice because i feel it on the steering wheel. One of my mechanic friends told me its air pockets in the power steering pump. I think you guys might know better. What could it be? and how can i get rid of it?

It's either:
1. Low on power steering fluid (which indicates a leak)
2. The power steering pump is going bad

Damn, well I hope that's covered in my warranty.