[purple-microblog/f12/master: 4/4] Merge branch 'master' into f12

[Matej Cepl]

commit 9957e2c2bcbf14bdea2cebb513d646276cc09130
Merge: 04131b3 7185581
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sun Aug 1 13:47:38 2010 +0200

    Merge branch 'master' into f12

 purple-microblog.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---