Before you update trunk, please do either:
This is required because a piece of machine generated code
(gnuradio_swig_python.py) has be replaced with a hand-written version.
If you don’t get rid of the old one, the update will complain, and
fail to get the latest code.
More info in the next message about why all this took place.
Sorry for the inconvenience,