Merge branch 'CVS' into 4K

Conflicts:
	DeckLink/include/DeckLinkAPI.h
	quad/Examples/ASI/asicfg.c
	quad/Examples/ASI/cknull.c
	quad/Examples/ASI/rxcfg.c
	quad/Examples/ASI/rxtest.c
	quad/Examples/ASI/txcfg.c
	quad/Examples/ASI/txtest.c
	quad/Examples/Makefile
	quad/Examples/SDI/Makefile
	quad/Examples/SDI/capture.c
	quad/Examples/SDI/eg1.c
	quad/Examples/mastercfg.c
	quad/Examples/pci_ids.h
	quad/Examples/util.c
	quad/doc/ASI/ioctls.txt
	quad/doc/ASI/sysfs.txt
	quad/doc/SDI/examples.txt
	quad/doc/SDI/ioctls.txt
	quad/doc/examples.txt
	quad/doc/functions.txt
	quad/doc/memory.txt
	quad/doc/sysfs.txt
	quad/include/asi.h
	quad/include/master.h
	quad/include/sdi.h
	quad/src/Makefile
	quad/src/as.c
	quad/src/asicore.c
	quad/src/asicore.h
	quad/src/asmi.c
	quad/src/dvbm.h
	quad/src/dvbm_fd.c
	quad/src/dvbm_fd.h
	quad/src/dvbm_fdu.c
	quad/src/dvbm_fdu.h
	quad/src/dvbm_lpfd.c
	quad/src/dvbm_lpfd.h
	quad/src/dvbm_q3inoe.c
	quad/src/dvbm_q3inoe.h
	quad/src/dvbm_q3ioe.c
	quad/src/dvbm_q3ioe.h
	quad/src/dvbm_qdual.c
	quad/src/dvbm_qdual.h
	quad/src/dvbm_qi.c
	quad/src/dvbm_qi.h
	quad/src/dvbm_qlf.c
	quad/src/dvbm_qlf.h
	quad/src/dvbm_qo.c
	quad/src/dvbm_qo.h
	quad/src/dvbm_rx.c
	quad/src/dvbm_rx.h
	quad/src/dvbm_rxu.c
	quad/src/dvbm_tx.c
	quad/src/dvbm_tx.h
	quad/src/dvbm_txu.c
	quad/src/dvbmaster.c
	quad/src/eeprom.c
	quad/src/eeprom.h
	quad/src/gt64131.c
	quad/src/gt64131.h
	quad/src/jtag.c
	quad/src/lsdma.c
	quad/src/lsdma.h
	quad/src/mdev.c
	quad/src/mdev.h
	quad/src/miface.c
	quad/src/miface.h
	quad/src/plx9080.c
	quad/src/plx9080.h
	quad/src/sa.c
	quad/src/sdicore.c
	quad/src/sdicore.h
	quad/src/sdim.h
	quad/src/sdim_lpfd.c
	quad/src/sdim_qie.c
	quad/src/sdim_qoe.c
	quad/src/sdim_qoe.h
	quad/src/sdimaster.c
	ultragrid/Makefile.in
	ultragrid/acconfig.h
	ultragrid/configure.in
	ultragrid/src/audio/audio.c
	ultragrid/src/audio/audio.h
	ultragrid/src/bitstream.c
	ultragrid/src/compat/drand48.c
	ultragrid/src/compat/gettimeofday.c
	ultragrid/src/compat/inet_ntop.c
	ultragrid/src/compat/inet_pton.c
	ultragrid/src/compat/platform_semaphore.c
	ultragrid/src/compat/vsnprintf.c
	ultragrid/src/config.h.in
	ultragrid/src/crypto/crypt_aes.c
	ultragrid/src/crypto/crypt_aes_impl.c
	ultragrid/src/crypto/crypt_des.c
	ultragrid/src/crypto/md5.c
	ultragrid/src/crypto/random.c
	ultragrid/src/debug.c
	ultragrid/src/host.h
	ultragrid/src/ihdtv/ihdtv.c
	ultragrid/src/ihdtv/ihdtv.h
	ultragrid/src/main.c
	ultragrid/src/ntp.c
	ultragrid/src/pdb.c
	ultragrid/src/rtp/decoders.c
	ultragrid/src/rtp/decoders.h
	ultragrid/src/rtp/net_udp.c
	ultragrid/src/rtp/pbuf.c
	ultragrid/src/rtp/pbuf.h
	ultragrid/src/rtp/ptime.c
	ultragrid/src/rtp/rtp.c
	ultragrid/src/rtp/rtp_callback.c
	ultragrid/src/rtp/rtp_callback.h
	ultragrid/src/tfrc.c
	ultragrid/src/transmit.c
	ultragrid/src/transmit.h
	ultragrid/src/tv.c
	ultragrid/src/video_capture.c
	ultragrid/src/video_capture.h
	ultragrid/src/video_capture/decklink.cpp
	ultragrid/src/video_capture/hdstation.c
	ultragrid/src/video_capture/null.c
	ultragrid/src/video_capture/quad.c
	ultragrid/src/video_capture/quad.h
	ultragrid/src/video_capture/quicktime.c
	ultragrid/src/video_capture/testcard.c
	ultragrid/src/video_codec.c
	ultragrid/src/video_codec.h
	ultragrid/src/video_compress.c
	ultragrid/src/video_compress.h
	ultragrid/src/video_display.c
	ultragrid/src/video_display.h
	ultragrid/src/video_display/dxt.c
	ultragrid/src/video_display/dxt.h
	ultragrid/src/video_display/gl_sdl.c
	ultragrid/src/video_display/gl_sdl.h
	ultragrid/src/video_display/hdstation.c
	ultragrid/src/video_display/hdstation.h
	ultragrid/src/video_display/null.c
	ultragrid/src/video_display/null.h
	ultragrid/src/video_display/sage.c
	ultragrid/src/video_display/sage.h
	ultragrid/src/video_display/sdl.c
	ultragrid/src/video_display/sdl.h
	ultragrid/test/run_tests.c
	ultragrid/test/test_aes.c
	ultragrid/test/test_bitstream.c
	ultragrid/test/test_des.c
	ultragrid/test/test_md5.c
	ultragrid/test/test_net_udp.c
	ultragrid/test/test_random.c
	ultragrid/test/test_rtp.c
	ultragrid/test/test_tv.c
	ultragrid/test/test_video_capture.c
	ultragrid/test/test_video_display.c