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

[Matej Cepl]

commit 04131b378005d6c889e1ff940acc047c044f685b
Merge: 89596ce 4dfabea
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sun Aug 1 13:45:35 2010 +0200

    Merge branch 'master' into f12

 purple-microblog.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---