[gnome-shell: 2/2] Merge branch 'bug589185-docinfo-time'

[Colin Walters <walters src gnome org>]

commit 6ea2822fa39399a9bdc44cc27156cc40c9a3026c
Merge: a7c1ff3... b4cf178...
Author: Colin Walters <walters verbum org>
Date:   Wed Jul 22 12:11:06 2009 -0400

    Merge branch 'bug589185-docinfo-time'

 js/ui/docDisplay.js     |   63 +++++++++++++++++++++++++++++++++++++++++-----
 js/ui/genericDisplay.js |    4 +++
 src/shell-global.c      |   39 +++++++++++++++++++++++++++++
 src/shell-global.h      |    2 +
 4 files changed, 101 insertions(+), 7 deletions(-)
---