Merge branch 'wip/wxgui' of http://gnuradio.org/git/jcorgan into wip/wxgui
authorJosh Blum <josh@joshknows.com>
Fri, 9 Oct 2009 03:54:32 +0000 (20:54 -0700)
committerJosh Blum <josh@joshknows.com>
Fri, 9 Oct 2009 03:54:32 +0000 (20:54 -0700)

Trivial merge