Andra Hugo 03b6b6a55b merge with trunk - part 1 15 lat temu
..
pi 03b6b6a55b merge with trunk - part 1 15 lat temu
Makefile.am 03b6b6a55b merge with trunk - part 1 15 lat temu