Merge branch 'sync' of http://gnuradio.org/git/trondeau into sync
authorMatt Ettus <matt@ettus.com>
Tue, 6 Oct 2009 22:38:07 +0000 (15:38 -0700)
committerMatt Ettus <matt@ettus.com>
Tue, 6 Oct 2009 22:38:07 +0000 (15:38 -0700)

Trivial merge