Merge branch 'a16s' into 'master'

we attempt to generate a unique file name for every posible combinations of...

See merge request !596

scripts/nvidia-xconf-gen.py

@@ -64,7 +64,7 @@ def write_xorg_conf(cards):
             screens.append("Screen"+str(j))
 
         for card in res:
-            filename = "/etc/X11/xorg.conf." + str(i) + str(res.index(card))
+            filename = "/etc/X11/xorg.conf." + str(i) + '_' + str(res.index(card))
             template.stream({'boardname':boardname,'monitors':monitors,'screens':screens,'devices':card}).dump(filename)
 
 if __name__ == "__main__":