Merge branch 'usrp_siggen' of http://gnuradio.org/git/jblum into master