Merge branch 'master' into sailfish-port
authorLuciano Montanaro <mikelima@cirulla.net>
Wed, 6 Nov 2013 22:00:19 +0000 (23:00 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Wed, 6 Nov 2013 22:00:51 +0000 (23:00 +0100)

Trivial merge