[authconfig/f14/master: 4/4] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/authconfig into f14

[Tomáš Mráz]

commit dcd2a9a1ae3be034160f401f8aae88de5b69e255
Merge: 79e3894 ef43102
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue Oct 19 08:40:16 2010 +0200

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/authconfig into f14
    
    Conflicts:
    	authconfig.spec

---