[ucview/el6: 6/6] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 09a931e2dd6acb2ceda964f72d038b587645587e
Merge: 93bb58f 4d55f43
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Oct 11 14:36:48 2011 +0200

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

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