Comment 4 for bug 640682

This is a sync 0.5-2 from Debian unstable. I'm converting this bug into a sync request.
ACK from me.