[purple-microblog/f13/master: 5/5] Merge branch 'f13/master' of ssh://pkgs.fedoraproject.org/purple-microblog into f13

[Matej Cepl]

commit e94dfd84d2a4b9919c8e3d1deca1055afbbd5802
Merge: 881aee3 ee1e4d6
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sun Aug 1 13:50:50 2010 +0200

    Merge branch 'f13/master' of ssh://pkgs.fedoraproject.org/purple-microblog into f13

---