Vladimír Čunát 576e9289dd Merge master into x-updates		2014-03-27 21:34:06 +01:00
..
xorg	Merge master into x-updates	2014-03-27 21:34:06 +01:00