[uhd/f16: 2/2] Merge branch 'master' into f16

[Jaroslav Škarvada]

commit 6575f59d7ee2feb494600dcb94a7e4e730c9c311
Merge: 523fb44 f68f07b
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Dec 2 17:21:38 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	uhd.spec

 .gitignore |    2 +-
 sources    |    2 +-
 uhd.spec   |    9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc uhd.spec
index 4884a94,53d1809..9aa1a5b
--- a/uhd.spec
+++ b/uhd.spec
@@@ -88,9 -97,9 +88,12 @@@ Documentation for the Universal Hardwar
  %doc %{_docdir}/%{name}/*
  
  %changelog
+ * Fri Dec  2 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.3.1-1
+ - New version
+ 
 +* Fri Dec  2 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.3.0-4
 +- Removed udev rule, it is handled by gnuradio-3.4 in f16
 +
  * Thu Dec  1 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.3.0-3
  - Updated summary to be more descriptive