Merge branch 'osx_10.6_64_fixes' of http://gnuradio.org/git/michaelld

This merge adds support for OSX 10.6 in gr-audio-osx and usrp.

Conflicts:
	usrp/host/lib/usrp_prims_libusb0.cc

diff --cc usrp/host/lib/usrp_prims_libusb0.cc
index 0d685d84f4939a71c83691376ce822be0d924cca,0c8c3d1de764b4a68cc57e69d369157fb7d33286..7053786d807926a02dd2df84a54b6d96cbf11a49
--- 1/usrp/host/lib/usrp_prims_libusb0.cc
--- 2/usrp/host/lib/usrp_prims_libusb0.cc
+++ b/usrp/host/lib/usrp_prims_libusb0.cc
@@@ -69,7 -69,7 +69,8 @@@ _get_usb_string_descriptor (struct usb_
      fprintf (stderr, "usrp: usb_get_string_descriptor failed: %s\n",
               usb_strerror());
    }
 -  return (ret);
++
 +  return ret;
  }
  
  int