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