[user-guide/f16: 42/42] Merge branch 'master' into f16

[Florian Nadge]

commit a8fe4a97532ca74176d39df4783e9a4fcfcaa948
Merge: 6579943 50a0011
Author: Florian Nadge <fnadge(a)redhat.com&gt;
Date:   Thu Sep 22 14:07:45 2011 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore

 .gitignore                                    |    1 +
 en-US/Accessing_the_Web.xml                   |    2 +-
 en-US/Book_Info.xml                           |    6 +-
 en-US/Communications.xml                      |   28 +-
 en-US/Connecting_to_the_Internet.xml          |  750 ++++++++++-------------
 en-US/Contributors_and_production_methods.xml |    2 +-
 en-US/Customizing_the_desktop.xml             |   99 +++-
 en-US/Financial_software.xml                  |    4 +-
 en-US/Managing_software.xml                   |  196 ++-----
 en-US/Media.xml                               |   95 +---
 en-US/Office_tools.xml                        |   56 +-
 en-US/Playing_games.xml                       |   37 +-
 en-US/Playing_multimedia.xml                  |  415 +++++--------
 en-US/Revision_History.xml                    |   13 +
 en-US/Sharing_your_desktop.xml                |   12 +-
 en-US/Tour_of_the_GNOME_desktop.xml           |  841 ++++++-------------------
 en-US/Tour_of_the_KDE_desktop.xml             |    2 +-
 en-US/User_Guide.ent                          |    2 +-
 publican.cfg                                  |    2 +
 19 files changed, 880 insertions(+), 1683 deletions(-)
---