Merged from trunk -r12699:12704

   Merged from trunk -r12699:12704

   | 12700   | In LazyItemsDict, avoid storing empty lists and dicts when   |
   | zmedico | no positional or keyword arguments are given.                |

   | 12701   | Fix headers that contain $Header instead of $Id.             |
   | zmedico |                                                              |

   | 12702   | Fix breakage in USE_EXPAND wildcard handling, from r12697.   |
   | zmedico |                                                              |

   | 12703   | Make USE_EXPAND wildcard expansion more efficient, and       |
   | zmedico | prevent possible duplicates.                                 |

   | 12704   | If deepcopy() raises a TypeError for a lazy item that has    |
   | zmedico | been added via a call to LazyItemsDict.addLazySingleton(),   |
   |         | automatically evaluate the the singleton and instead call    |
   |         | deepcopy() on the result.                                    |

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