[ladvd: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ladvd

[Tomasz Torcz]

commit 5e9af39f1fc0073300e078af8c5bf0f11c9de16a
Merge: 72af8b9 787c3a0
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date:   Tue Jan 24 15:22:53 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ladvd
    
    Conflicts:
    	ladvd.spec
     merge problems

---