Merged from trunk 10869:10875

   Merged from trunk 10869:10875

   | 10870   | Py3k compatibility patch #1 by Ali Polatel <hawking@g.o>.    |
   | zmedico | Replace dict.has_key() calls with "in" and "not in"          |
   |         | operators..                                                  |

   | 10871   | Py3k compatibility patch #2 by Ali Polatel <hawking@g.o>.    |
   | zmedico | Replace dict.has_key() calls with "in" and "not in"          |
   |         | operators.                                                   |

   | 10872   | Py3k compatibility patch #3 by Ali Polatel <hawking@g.o>.    |
   | zmedico | Replace dict.has_key() calls with "in" and "not in"          |
   |         | operators.                                                   |

   | 10873   | Py3k compatibility patch #4 by Ali Polatel <hawking@g.o>.    |
   | zmedico | Replace dict.has_key() calls with "in" and "not in"          |
   |         | operators.                                                   |

   | 10874   | Py3k compatibility patch #5 by Ali Polatel <hawking@g.o>.    |
   | zmedico | Replace dict.has_key() calls with "in" and "not in"          |
   |         | operators.                                                   |

   | 10875   | Py3k compatibility patch #6 by Ali Polatel <hawking@g.o>.    |
   | zmedico | Replace dict.has_key() calls with "in" and "not in"          |
   |         | operators.                                                   |

svn path=/main/branches/prefix/; revision=10881