commit 7acb616220bc290acad39c4eea4bffa76c951796 Merge: b1a585d ff2e183 Author: Matěj Cepl <mcepl at redhat.com> Date: Mon Jan 9 12:48:07 2012 +0100 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/pyexiv2 into el6 Conflicts: pyexiv2.spec ---