Merge branch 'wxgui_fix' from http://gnuradio.org/git/jblum.git into master