Merge branch 'master' of ralfj.de:dsl

diff --cc gui.py
index 0ae8958061e78536a02bd43c8532802108ce2a61,a0fb3bb77b9fccda0369c58d5b685507480cead7..25f71c2e7c28fc1c477cd07182fa19d65a3f0a99
--- 1/gui.py
--- 2/gui.py
+++ b/gui.py
@@@ -12,10 -12,10 +12,10 @@@
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
- # along with this program (gpl.txt); if not, write to the Free Software
+ # along with this program; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
 -# This file bstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
 +# This file abstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
  import sys
  from PyQt4 import QtGui
  from qt_dialogue import PositionSelection