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