Merged from trunk -r14378:14388

   Merged from trunk -r14378:14388

   | 14379   | Replace doct.keys() usage with __iter__(), since it behaves  |
   | zmedico | identically in both python 2.x and 3.x.                      |

   | 14380   | Replace dict.keys() usage with __iter__(), since it behaves  |
   | zmedico | identically in both python 2.x and 3.x.                      |

   | 14381   | Fix for python 3.x compatibility.                            |
   | zmedico |                                                              |

   | 14382   | Replace dict.keys() usage with __iter__(), since it behaves  |
   | zmedico | identically in both python 2.x and 3.x.                      |

   | 14383   | Remove code that's been commented out.                       |
   | zmedico |                                                              |

   | 14384   | Replace dict.keys() usage with __iter__(), since it behaves  |
   | zmedico | identically in both python 2.x and 3.x.                      |

   | 14385   | Replace dict.keys() usage with __iter__(), since it behaves  |
   | zmedico | identically in both python 2.x and 3.x.                      |

   | 14386   | Disable the ignore_none parameter for stack_dicts() since    |
   | zmedico | having it return None instead of a dict sometimes is         |
   |         | hazardous.                                                   |

   | 14387   | Clean up stack_dicts() a little.                             |
   | zmedico |                                                              |

   | 14388   | Don't pass the ignore_none parameter to stack_dicts() since  |
   | zmedico | it does nothing now.                                         |

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