[megaglest/f17: 3/3] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/megaglest into f17

[pcpa]

commit 5dd9a9f80043a2bda3f4c532a301d0d38e0855a0
Merge: bc02158 71faba1
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Wed Jan 16 15:52:07 2013 -0200

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/megaglest into f17

---