I've been doing the rolling a bottle of ice thing, and the stretches.
I looked it up on wiki, mine seems a bit different, maybe my doctor was wrong?
Wiki says it's worse when you first get up, or have been sitting a while, and gets better with walking. Mine feels ok at first, gets worse with standing and walking.
So by the time I'm leaving work I'm limping pretty heavily :(