MozStumbler rebase by Noam