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

[Fabian Affolter]

commit 0de77a46f0315330934fb821181da6eb3fd74689
Merge: 5d6705e b3f4630
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Wed Nov 3 21:38:37 2010 +0100

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

---