Merge branch 'grc' of http://gnuradio.org/git/jblum into master
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Sat, 19 Sep 2009 05:27:38 +0000 (22:27 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Sat, 19 Sep 2009 05:27:38 +0000 (22:27 -0700)

Trivial merge