--- /etc/X11/xorg.conf-xorg	2008-08-30 11:31:23.000000000 +0100
+++ /etc/X11/xorg.conf-xorg-git	2008-10-23 15:04:41.000000000 +0100
@@ -14,72 +14,87 @@
 # again, run the following command:
 #   sudo dpkg-reconfigure -phigh xserver-xorg
 
+Section "Files"
+	FontPath	"/usr/share/fonts/X11/100dpi"
+	FontPath	"/usr/share/fonts/X11/75dpi"
+	FontPath	"/usr/share/fonts/X11/Type1"
+	FontPath	"/usr/share/fonts/X11/misc"
+EndSection
+
 Section "InputDevice"
 	Identifier	"Generic Keyboard"
 	Driver		"kbd"
-	Option		"XkbRules"	"xorg"
-	Option		"XkbModel"	"pc105"
-	Option		"XkbLayout"	"gb"
 	Option		"CoreKeyboard"
+	Option		"XkbRules"		"xorg"
+	Option		"XkbModel"		"pc105"
+	Option		"XkbLayout"		"gb"
 EndSection
 
 Section "InputDevice"
 	Identifier	"Configured Mouse"
 	Driver		"mouse"
-#	Option		"Protocol"	"ImPS/2"
-	Option		"Device"	"/dev/input/mouse0"
+	Option		"Device"		"/dev/input/mouse0"
 	Option          "Emulate3Buttons"	"false"
 	Option		"CorePointer"
 EndSection
 
-Section "Device"
-	Identifier	"Configured Video Device"
-	Driver      "vesa"
-	BusID       "PCI:1:0:0"
-EndSection
-
 Section "Monitor"
 	Identifier	"Syncmaster 957p"
 	HorizSync	30-96
 	VertRefresh	50-160
+	Option		"PreferredMode"		"1600x1200"
 EndSection
 
 Section "Monitor"
 	Identifier	"Dell 2408WFP"
+	Option		"PreferredMode"		"1920x1200"
+	Option		"Position"		"1280 853"
+EndSection
+
+Section "Monitor"
+	Identifier	"HP L1906"
+	Option		"LeftOf"		"Dell 2408WFP"
+	Option		"PreferredMode"		"1280x1024"
+	Option		"Position"		"0 0"
+
+#	Option		"LeftOf"		"Syncmaster 957p"
+EndSection
+
+Section "Device"
+	Identifier	"RadeonHD"
+	Driver		"radeonhd"
+	BusID		"PCI:1:0:0"
+	Option		"Monitor-DVI-I_1/digital"	"Dell 2408WFP"
+	Option		"Monitor-DVI-I_2/analog"	"HP L1906"
+	Option		"RROutputOrder"			"DVI-I_1/digital DVI-I_2/analog"
+
+#	Option		"Monitor-DVI-I_1/analog"	"Syncmaster 957p"
+#	Option		"RROutputOrder"			"DVI-I_1/analog  DVI-I_2/analog"
+EndSection
+
+Section "Device"
+	Identifier	"Radeon"
+	Driver		"radeon"
+	BusID		"PCI:1:0:0"
+	Option		"DefaultConnectorTable"	"true"
 EndSection
 
 Section "Screen"
 	Identifier	"Default Screen"
-	Device		"Configured Video Device"
+	Device		"RadeonHD"
+#	Device		"Radeon"
 	Monitor		"Dell 2408WFP"
+#	Monitor		"Syncmaster 957p"
 	DefaultDepth     24
 	SubSection "Display"
-		Viewport   0 0
-		Depth     24
-		Modes	"1920x1200"
-		Modes	"1600x1200"
-		Modes	"1440x900"
-		Modes	"1400x1050"
-		Modes	"1280x960"
-		Modes	"1280x768"
-		Modes	"1280x720"
-		Modes	"1280x1024"
-		Modes	"1152x864"
-		Modes	"1024x768"
-		Modes	"800x600"
-		Modes	"720x480"
-		Modes	"640x480"
-		Modes	"640x400"
-		Modes	"512x384"
-		Modes	"400x300"
-		Modes	"320x240"
-		Modes	"320x200"
+		Depth		24
+		Virtual         3200 1200
 	EndSubSection
 EndSection
 
 Section "ServerLayout"
         Identifier      "Default Layout"
-        Screen          "Default Screen"
+        Screen          0 "Default Screen" 0 0
         InputDevice     "Generic Keyboard"
         InputDevice     "Configured Mouse"
 EndSection