Merge branch 'wxgui' of git@gnuradio.org:jblum into grc
authorJosh Blum <josh@joshknows.com>
Tue, 25 Aug 2009 04:35:46 +0000 (21:35 -0700)
committerJosh Blum <josh@joshknows.com>
Tue, 25 Aug 2009 04:35:46 +0000 (21:35 -0700)

Trivial merge