[ucview/el5/master: 16/16] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 078b042a3dd36b94c8b6a8aa0a35c2ac0e593a94
Merge: ed0e53a d59d4e3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Oct 18 01:07:17 2010 +0200

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	ucview.spec

 .gitignore  |    2 +-
 sources     |    2 +-
 ucview.spec |    7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)
---