Fix handling of GR_USE_SYSTEM_LIBGSM and GR_USE_SYSTEM_LIBCODEC2
blocks: remove stray ctrlport XML definitions
Merge remote-tracking branch 'maitland/gr-vocoder-use-system-codecs' into maint
vocoder: minor cleanup in library detection
Merge branch 'maint'
cmake: fix FindUHD.cmake to work better wit CMake 2.6, and in general.
trellis: fix cmake variables for compatibility
Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'
cmake: fix setting and usage of CMAKE_MODULES_DIR
cmake: whitespace only
cmake: on APPLE only, add defaults for rpath and install name info for libraries
Merge remote-tracking branch 'michaelld/refix_findUHD'
Merge remote-tracking branch 'michaelld/cmake_fixes'
digital: fixes a bug in the mpsk SNR estimators where they were reporting 3 dB too high.
Merge branch 'maint'
digital: adding output message ports for MPSK SNR probe block. Can be used to feed back SNR information to other blocks.
support comedi whenever found

Remove the LINUX dependency from the gr-comedi CMake rules,
as, for example, comedi also has support on Debian kFreeBSD
which is not a LINUX platform.
find USB on all platforms

Keep the 'usb-1.0' as the preferred match, but also match simply
'usb' as provided on some platforms. Allows kFreeBSD system support.
Merge branch 'maint'
Updated to revision 3.7.4.1 for release.