Well, that bugfix didn't take.  Let's try again.
Well, that bugfix didn't take.  Let's try again.

pombredanne/nsrlsvr,pombredanne/nsrlsvr,rjhansen/nsrlsvr,rjhansen/nsrlsvr,pombredanne/nsrlsvr,rjhansen/nsrlsvr