Merge branch 'usrp2_set_ant' of git://gnuradio.org/jblum