I am curious, what do you do when you suffer a broken spoke on the commute? At the office yesterday, I discovered that I had a couple of broken spokes. I have cutters at the office so I nippped them out. However, I don't carry anything with me that I could have removed the dangling spokes with. I'm thinking I should add a spoke wrench to my kit - anything else I should add?

The braking surface of that rim is nearing the end of it's life so I'll probably just have the wheel rebuilt instead of replacing the spokes and retruing the wheel.