[gnome-user-docs: 21/21] Merge branch 'gnome-3-0'

[Shaun McCance <shaunm src gnome org>]

commit 2eb7282cbce0dcf2927dd123448cf6c76acd35c6
Merge: c12275f 1ada22d
Author: Shaun McCance <shaunm gnome org>
Date:   Wed May 11 09:32:26 2011 -0400

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	gnome-help/es/es.po

 .gitignore                          |    6 ++++++
 NEWS                                |    6 ++++++
 configure.in                        |    2 +-
 gnome-help/C/backup-where.page      |    2 +-
 gnome-help/C/disk-capacity.page     |    4 ----
 gnome-help/C/disk-check.page        |    3 ---
 gnome-help/C/mouse-sensitivity.page |    2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)
---