Merge branch 'master' into libusb-1.0
[debian/gnuradio] / usrp / doc / usrp_guide.xml
2006-08-03 jcorganHouston, we have a trunk.