Merge branch 'patches/marcus/gr_and_const'

* patches/marcus/gr_and_const:
  grc: adds gr.and_const to block tree

diff --combined grc/blocks/Makefile.am
index 2596eae45600c74013af035c18b07594c1368f67,8e50225e72c453efcaaf41750111704b4e9d3451..18420a013320aa60aabe2adf9b87c72207486539
--- 1/grc/blocks/Makefile.am
--- 2/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@@ -71,6 -71,7 +71,7 @@@ dist_ourdata_DATA = 
        gr_agc2_xx.xml \
        gr_agc_xx.xml \
        gr_and_xx.xml \
+       gr_and_const_xx.xml \
        gr_argmax_xx.xml \
        gr_binary_slicer_fb.xml \
        gr_channel_model.xml \
@@@ -91,6 -92,7 +92,6 @@@
        gr_correlate_access_code_bb.xml \
        gr_costas_loop_cc.xml \
        gr_cpfsk_bc.xml \
 -      gr_dd_mpsk_sync_cc.xml \
        gr_decode_ccsds_27_fb.xml \
        gr_deinterleave.xml \
        gr_delay.xml \

diff --combined grc/blocks/block_tree.xml
index 8d91258e516f08417a64f361c0ff2007b57da3db,6597f5b83442b083c4f3e4f2023a57360e3c3c5d..610a881026c12075b7c6ddfbb67bc42281cb990e
--- 1/grc/blocks/block_tree.xml
--- 2/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@@ -58,6 -58,7 +58,7 @@@
  
                <block>gr_add_const_vxx</block>
                <block>gr_multiply_const_vxx</block>
+               <block>gr_and_const_xx</block>
  
                <block>gr_not_xx</block>
                <block>gr_and_xx</block>
@@@ -130,6 -131,7 +131,6 @@@
                <block>gr_pfb_clock_sync_xxx</block>
  
                <block>gr_costas_loop_cc</block>
 -              <block>gr_dd_mpsk_sync_cc</block>
                <block>gr_mpsk_sync_cc</block>
                <block>gr_mpsk_receiver_cc</block>