Merge branch 'master' of http://gnuradio.org/git/gnuradio
authorMatt Ettus <matt@ettus.com>
Thu, 26 Nov 2009 19:20:30 +0000 (11:20 -0800)
committerMatt Ettus <matt@ettus.com>
Thu, 26 Nov 2009 19:20:30 +0000 (11:20 -0800)

Trivial merge