Merge remote-tracking branch 'haiku/master' into package-management

This reverts 8f7f28a7c3 (OpenGL: Upgrade
to
Mesa 9.2).

Conflicts:
	build/jam/BuildFeatures
	build/jam/HaikuImage
	build/jam/OptionalPackages
	build/scripts/build_cross_tools_gcc4
	src/add-ons/opengl/swpipe/Jamfile
	src/apps/diskusage/Jamfile
	src/kits/tracker/ContainerWindow.cpp
	src/kits/tracker/DeskWindow.cpp
	src/kits/tracker/Jamfile

src/apps/aboutsystem/AboutSystem.cpp

@@ -1008,6 +1008,7 @@ AboutView::_CreateCreditsView()
 		"Oliver Ruiz Dorantes\n"
 		"Axel Dörfler\n"
 		"Jérôme Duval\n"
+		"Pawel Dziepak\n"
 		"René Gollent\n"
 		"Bryce Groff\n"
 		"Colin Günther\n"
@@ -1025,6 +1026,7 @@ AboutView::_CreateCreditsView()
 		"François Revol\n"
 		"Philippe Saint-Pierre\n"
 		"John Scipione\n"
+		"Alex Smith\n"
 		"Jonas Sundström\n"
 		"Oliver Tappe\n"
 		"Gerasim Troeglazov\n"
@@ -1102,7 +1104,6 @@ AboutView::_CreateCreditsView()
 		"Yongcong Du\n"
 		"Cian Duffy\n"
 		"Vincent Duvert\n"
-		"Pawel Dziepak\n"
 		"Mikael Eiman\n"
 		"Fredrik Ekdahl\n"
 		"Joshua R. Elsasser\n"
@@ -1180,7 +1181,6 @@ AboutView::_CreateCreditsView()
 		"Ralf Schülke\n"
 		"Zousar Shaker\n"
 		"Caitlin Shaw\n"
-		"Alex Smith\n"
 		"Geoffry Song\n"
 		"Daniel Switkin\n"
 		"Atsushi Takamatsu\n"