xdpyinfo: Changes to 'master'

[Alan Coopersmith]

 configure.ac |    2 +-
 xdpyinfo.c   |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit f9eaeadea17cb96ab85ee6cc0b5aa3867a832bcc
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Sep 21 16:27:55 2009 -0700

    Use xf86vmproto.h instead of xf86vmstr.h if it is installed
    
    Clears warnings when built with xf86vidmodeproto 2.2.99.1 & later
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>