Merge branch 'dfsg-orig'

Conflicts:
	gr-gsm-fr-vocoder/src/lib/gsm/COPYRIGHT
	grc/scripts/gnuradio-companion

diff --combined gnuradio-examples/python/digital/transmit_path.py
index 0567701b10a61bfb2189f58abbaa931332f82c5a,86ebf75c3e87b70482f5a110b7dc664450ee16f3..b3770479635af2cd8e31fe97cf9394433f494755
--- 1/gnuradio-examples/python/digital/transmit_path.py
--- 2/gnuradio-examples/python/digital/transmit_path.py
+++ b/gnuradio-examples/python/digital/transmit_path.py
@@@ -1,4 -1,3 +1,4 @@@
 +#!/usr/bin/env python
  #
  # Copyright 2005, 2006, 2007 Free Software Foundation, Inc.
  # 
@@@ -100,7 -99,7 +100,7 @@@ class transmit_path(gr.hier_block2)
                            help="set transmitter digital amplitude: 0 <= AMPL < 1 [default=%default]")
          normal.add_option("-v", "--verbose", action="store_true", default=False)
  
-         expert.add_option("-S", "--samples-per-symbol", type="int", default=2,
+         expert.add_option("-S", "--samples-per-symbol", type="float", default=None,
                            help="set samples/symbol [default=%default]")
          expert.add_option("", "--log", action="store_true", default=False,
                            help="Log all parts of flow graph to file (CAUTION: lots of data)")
@@@ -115,5 -114,5 +115,5 @@@
          print "Tx amplitude     %s"    % (self._tx_amplitude)
          print "modulation:      %s"    % (self._modulator_class.__name__)
          print "bitrate:         %sb/s" % (eng_notation.num_to_str(self._bitrate))
-         print "samples/symbol:  %3d"   % (self._samples_per_symbol)
+         print "samples/symbol:  %.4f"    % (self._samples_per_symbol)