Merge branch 'bef' of http://gnuradio.org/git/trondeau
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Fri, 18 Dec 2009 00:40:09 +0000 (16:40 -0800)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Fri, 18 Dec 2009 00:40:09 +0000 (16:40 -0800)

Trivial merge