Comment 4 for bug 941773

Sent a patch to the NM mailing list, we're just waiting for them to commit it...