[user-guide: 2/2] Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/user-guide

[Ben Cotton]

commit c4b08ce6dc14b0ce96467895b427dc5b11771b23
Merge: 6a7b310... 0df880c...
Author: Ben Cotton <bcotton at fedoraproject.org>
Date:   Tue Oct 26 16:54:38 2010 -0400

    Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/user-guide

 en-US/Book_Info.xml  |    2 +-
 en-US/User_Guide.ent |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---