Merge branch 'master' into wip/burx_support
[debian/gnuradio] / gr-comedi / gnuradio-comedi.pc.in
2009-05-27 jcorganMerged r11123:11148 from jcorgan/np into trunk.