[uhd/f21: 4/4] Merge remote-tracking branch 'origin/master' into f21

[Jaroslav Škarvada]

commit 9b20437148b2af86868f2ba92da62752febc05a4
Merge: 403c931 b6f7066
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Aug 29 15:26:21 2014 +0200

    Merge remote-tracking branch 'origin/master' into f21
    
    Conflicts:
    	uhd.spec

 uhd.spec |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)
---