Merge branch 'wip/grc/draw' of http://gnuradio.org/git/jblum