files (happened to me because i had two py lib checkouts) --HG-- branch : trunk
the merge of the config branch into the trunk) --HG-- branch : trunk