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

[Petr Kovář]

commit e2e80bdee84420ccfc9399f9539d28f7f1cd942d
Merge: a4d466f ba5eb0b
Author: Petr Kovar <pkovar at redhat.com>
Date:   Tue Nov 8 20:03:19 2011 +0100

    Merge branch 'master' into f16

 en-US/Tour_of_the_Xfce_desktop.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---