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

Trivial merge