Merge branch 'master' into sync

Conflicts:
	gr-utils/src/python/gr_plot_qt.py
	gr-utils/src/python/pyqt_plot.py
	gr-utils/src/python/pyqt_plot.ui

diff --cc gr-utils/src/python/pyqt_plot.py
index 3b8b4c9e86832f76e72b8cc498277881c68bd3ee,98977da975ae84e0e0ab1ce250f650b81b840f76..5650135abf4a072420c0a183f27d039da6ae580e
--- 1/gr-utils/src/python/pyqt_plot.py
--- 2/gr-utils/src/python/pyqt_plot.py
+++ b/gr-utils/src/python/pyqt_plot.py
@@@ -2,8 -2,8 +2,8 @@@
  
  # Form implementation generated from reading ui file 'pyqt_plot.ui'
  #
- # Created: Mon Aug 31 22:12:05 2009
 -# Created: Tue Sep  1 23:02:36 2009
 -#      by: PyQt4 UI code generator 4.4.3
++# Created: Tue Oct  6 10:39:58 2009
 +#      by: PyQt4 UI code generator 4.4.4
  #
  # WARNING! All changes made in this file will be lost!