Merge branch 'wip/grc/general' of jblum@blumhouse:~/git/gnuradio into wip/grc
authorJosh Blum <josh@joshknows.com>
Wed, 28 Oct 2009 21:12:08 +0000 (14:12 -0700)
committerJosh Blum <josh@joshknows.com>
Wed, 28 Oct 2009 21:12:08 +0000 (14:12 -0700)

Trivial merge