xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86RandR.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9111944b292355f7478b4ae75bead8dc25edbbcb
Author: Julien Cristau <jcristau at debian.org>
Date:   Tue Jul 15 10:36:38 2008 -0400

    Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0.

diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index f30674f..10ec370 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -55,6 +55,8 @@ xf86RandRModeRefresh (DisplayModePtr mode)
 {
     if (mode->VRefresh)
 	return (int) (mode->VRefresh + 0.5);
+    else if (mode->Clock == 0)
+	return 0;
     else
 	return (int) (mode->Clock * 1000.0 / mode->HTotal / mode->VTotal + 0.5);
 }