[gnome-shell/overlay-design02: 3/3] Merge branch 'master' into my-overlay-design

[Marina Zhurakhinskaya <marinaz src gnome org>]

commit 614e83476ef6ffbb7adacdbaf9153fa4a3e42921
Merge: 4e2a301... e478cc4...
Author: Marina Zhurakhinskaya <marinaz redhat com>
Date:   Tue Jun 16 13:04:56 2009 -0400

    Merge branch 'master' into my-overlay-design

 js/ui/docDisplay.js    |    2 +-
 src/shell-app-system.c |    2 +-
 src/shell-global.c     |   29 +++++++++++++++++++++--------
 src/shell-global.h     |    2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)
---