Merge branch 'sync' of http://gnuradio.org/git/matt into wip/examples
authorJosh Blum <josh@joshknows.com>
Wed, 7 Oct 2009 00:36:25 +0000 (17:36 -0700)
committerJosh Blum <josh@joshknows.com>
Wed, 7 Oct 2009 00:36:25 +0000 (17:36 -0700)

Trivial merge