[arch-commits] Commit in python-egenix-mx-base/repos (extra-i686)

[Douglas Soares de Andrade]

    Date: Friday, September 5, 2008 @ 22:38:48
  Author: douglas
Revision: 11876

Fixing conflicts

Modified:
  python-egenix-mx-base/repos/extra-i686/	(properties)


Property changes on: python-egenix-mx-base/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /python-egenix-mx-base/trunk:1
   + /python-egenix-mx-base/trunk:1-11875