[purple-microblog/f13/master: 3/3] Merge branch 'master' into f13

[Matej Cepl]

commit f4864d34d1ef7a91233ed9b879dbf0f87c05b985
Merge: e94dfd8 d187a26
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Aug 23 23:51:59 2010 -0400

    Merge branch 'master' into f13

 purple-microblog.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---