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

[Michel Alexandre Salim]

commit 659ae20a6bcafd93f6c4231c8cb9aea35a0d47e1
Merge: 5c95f6c ca12642
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Nov 6 17:06:15 2010 +0100

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

---