commit 4fccebeeb4545c3a9351b045df1ea54c853bbfe2 Merge: 0d2e713 8ec90ba Author: Robert Scheck <robert at fedoraproject.org> Date: Sun Oct 9 03:06:46 2011 +0200 Merge branch 'f14' of ssh://pkgs.fedoraproject.org/libunicap into f14 Conflicts: libunicap.spec ---