jsocol/kitsune — pull request #301 by erikrose (2011-10-26 00:21:55+00:00)
Title: [bug 697287] Update oedipus to master.

r? When we branched oedipus to fix bug 695667, we branched too early, just before the commit that would have fixed this. Advancing kitsune/next to oedipus/master to pick up the fix. The rest of the changes between here and there shouldn't affect anything.