grc: python 2.6 compatibility fix
qtgui: accounted for MSVC having _finite() instead of std::isfinite()
modtool: Fixed a bug in makexml for int-type io signatures
Merge remote-tracking branch 'martin/modtool/bugfix' into maint
Fix for #647 - GUI Tabs do not switch on WX GUI Scope sink channels on OSX

With this patch, the bug is not showing anymore. It was only tested by
me on Mac OS X - not on Linux nor other platforms.
The possible regressions introduced by fix should be limited to the
notebook chooser forms only.
Merge remote-tracking branch 'gnuradio-wg-grc/grc_py26_compat_fix' into maint
cmake: backport parallel build fix to maint branch
cmake: add parallel build fix to gr_modtool template
blocks: Fixed some broken license headers
uhd: Fixed minor issue with kwargs in amsg_source
grc: only fix old message connections if both ends are valid
Merge remote-tracking branch 'martin/uhd/bug682' into maint
The functions in wavfile.cc are publicly exported.
Merge remote-tracking branch 'ncorgan/qtgui/msvc_bugfix' into maint
Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint
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
digital: fixes a bug in the mpsk SNR estimators where they were reporting 3 dB too high.