Merge branch 'grc/dualusrp' of git://gnuradio.org/jblum