Merge branch 'upstream'

diff --cc gnuradio-examples/python/digital/fusb_options.py
Simple merge

diff --cc gnuradio-examples/python/digital/pick_bitrate.py
Simple merge

diff --cc gnuradio-examples/python/digital/transmit_path.py
Simple merge

diff --cc usrp/doc/Makefile.am
Simple merge

diff --cc usrp/doc/Makefile.in
Simple merge