set numpy_mappings -> dict, to fix py2.6 incompatibility
qtgui: fixing up some minor parameters.
volk: changes QA code to use volk_malloc and volk_free.

Also fixes white space issues in qa_util.cc
pmt_to_python: numpy_to_uvector and reverse works, QA added
renamed and cleaned up a bit
Merge branch 'master' of github:gnuradio/gnuradio into pmt_to_python-py2.6-compat
grc: adding param templates
qtgui: changing line config params to use base_key to make cleaner.

Also handles complex inputs to time sink better.
grc: move FileParam to gui module
grc: validate params only on focus-out
Merge remote-tracking branch 'mmueller/pmt_to_python-py2.6-compat'
digital: white space removal.
digital: fix for issue #664.

The mpsk_receiver_cc block needed to publicly inherit from control_loop.
digital: fix for issue #663.

Allows the correlate_access_code to use access codes >= 32 bits.
digital: updated test_corr_and_sync to give time sink lines default labels.
Merge branch 'master' into next
digital: fix for issue #664.

The mpsk_receiver_cc block needed to publicly inherit from control_loop.
Merge branch 'maint'
Merge branch 'master' into next