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

[Robert Scheck]

commit 5c43d86b8838c165fe74d61e1f4784292dc602b3
Merge: ec06ea3 0291a5b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Dec 26 00:28:37 2011 +0100

    Merge remote branch 'origin/master' into el6

 ucview.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---