Merge branch 'sync' of http://gnuradio.org/git/matt into sync
authorTom <trondeau@vt.edu>
Wed, 7 Oct 2009 00:55:17 +0000 (17:55 -0700)
committerTom <trondeau@vt.edu>
Wed, 7 Oct 2009 00:55:17 +0000 (17:55 -0700)

Trivial merge