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

[Matej Cepl]

commit 89596cebfa5b92657db7e436d2c60c5c0ac7ed3d
Merge: 7804af8 321e130
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sun Aug 1 11:36:17 2010 +0200

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	purple-microblog.spec

 purple-microblog.spec |    6 +++---
 sources               |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---