Merge branch 'wxgui' of git@gnuradio.org:jblum into vrt
authorJosh Blum <josh@joshknows.com>
Sun, 23 Aug 2009 19:30:12 +0000 (12:30 -0700)
committerJosh Blum <josh@joshknows.com>
Sun, 23 Aug 2009 19:30:12 +0000 (12:30 -0700)

Trivial merge