Merge branch 'sync' of http://gnuradio.org/git/trondeau into sync
authorMatt Ettus <matt@ettus.com>
Wed, 7 Oct 2009 00:56:38 +0000 (17:56 -0700)
committerMatt Ettus <matt@ettus.com>
Wed, 7 Oct 2009 00:56:38 +0000 (17:56 -0700)

Trivial merge