This 5 Movement flow is a staple for my shoulder rehab patients lately.  I have this flow down pat and run through it quickly before EVERY workout that I do as part of my warm-up.  I recommend that you do the same for 2-6 weeks.  Your scap will thank you.

http://www.youtube.com/watch?v=38DMbZEl0iI?rel=0