Merge branch 'sync' of http://gnuradio.org/git/trondeau into sync