[aespipe: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/aespipe

[Jirka Hladky]

commit 553c82b904280c4526dd60401b5eadfb01b44d85
Merge: eaaaf05 3e17650
Author: Jirka Hladky <hladky.jiri at gmail.com>
Date:   Sun Jul 3 01:16:28 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/aespipe
    
    Conflicts:
    	aespipe.spec

---