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

Trivial merge