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

[Matej Cepl]

commit 3b715fee29bc2aabb24b7cada0f0bc51e66945bf
Merge: 9957e2c d187a26
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Aug 23 23:48:41 2010 -0400

    Merge branch 'el5' into el6

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