add o2 carrier (bug 1057106)

Need to add this to -dev for testing, will roll back if necessary.
Yes, and I totally missed it because I was looking elsewhere for problem. Thanks for putting the test in!