[gnome-control-center: 8/8] Merge branch 'display-capplet-ui-cleanup'

[Federico Mena Quintero <federico src gnome org>]

commit b03eba7c2fd1449584182ae79a9c98f2a1a8784d
Merge: b4ec774 38bd064
Author: Federico Mena Quintero <federico novell com>
Date:   Wed Feb 17 17:56:18 2010 -0600

    Merge branch 'display-capplet-ui-cleanup'
    
    This makes the following changes in the display capplet:
    
    - Now fits in 640x480 and has a better layout overall.
    
    - We just use "monitors" for wording, not a mixture of "monitor",
      "display", "screen".
    
    - Make the mouse cursor indicate when you can drag a monitor.

 capplets/display/display-capplet.ui |  489 ++++++++++++++++++-----------------
 capplets/display/xrandr-capplet.c   |   57 +++--
 2 files changed, 289 insertions(+), 257 deletions(-)
---