Tilman Sauerbeck db704af437 Merge branch '2.5' into 2.6
Conflicts:
	xorg-server/Pkgfile
2009-08-03 18:12:30 +02:00
..
2009-04-20 21:21:35 +02:00
2009-08-01 11:32:02 +02:00
2009-08-03 18:12:30 +02:00