Merge branch 'harmattan-port'

of ssh://drop.maemo.org/git/quandoparte into harmattan-port

Conflicts:
	application/resources/stations/stations.qpl

diff --cc application/resources/stations/stations.qpl
index b851b6d,c85623e..d39ca8d
--- 1/application/resources/stations/stations.qpl
--- 2/application/resources/stations/stations.qpl
+++ b/application/resources/stations/stations.qpl
@@@ -4648,6 -4556,6 +4556,18 @@@
          <name>Caltanissetta Centrale</name>
      </station>
      <station>
++        <pos>37.4312241,13.8826100</pos>
++        <name>Serradifalco</name>
++    </station>
++    <station>
++        <pos>37.4696478,13.9976064</pos>
++        <name>San Cataldo</name>
++    </station>
++    <station>
++        <pos>37.4884910,14.0573425</pos>
++        <name>Caltanissetta Centrale</name>
++    </station>
++    <station>
          <pos>37.1449872,14.4035066</pos>
          <name>Niscemi</name>
      </station>