Merge branch 'master' of git://ralfj.de/dsl

diff --cc dsl.py
index dad969abdaebe9cce52044fa99d4703d1af4906b,396468d5bfca273ac8058b3cd980ea307c92e944..c7ea0f9ad333dc0d249edc4eacd4f66ca6f1afd2
--- 1/dsl.py
--- 2/dsl.py
+++ b/dsl.py
@@@ -16,12 -16,13 +16,12 @@@
  # along with this program (gpl.txt); if not, write to the Free Software
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
 -import os, sys, re, subprocess
 -from PyQt4 import QtGui
 +import os, re, subprocess
  from selector_window import PositionSelection
 -app = QtGui.QApplication(sys.argv)
 +import gui
  
  # for auto-config: common names of internal connectors
- commonInternalConnectorNames = ['LVDS', 'LVDS1']
+ commonInternalConnectorNames = ['LVDS', 'LVDS0', 'LVDS1', 'LVDS-0', 'LVDS-1']
  
  # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
  def loadConfigFile(file):