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

[Zach Oglesby]

commit 1c2bdcf2a87f2048cd8e527df6dbfd3b4fc39f66
Merge: d3e02ee c3de556
Author: Zach Oglesby <oglesbyzm at gmail.com>
Date:   Mon Sep 12 17:39:20 2011 -0400

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

 en-US/Book_Info.xml  |    6 +-
 en-US/Media.xml      |  252 +-------------------------------------------------
 en-US/User_Guide.ent |    2 +-
 publican.cfg         |    2 +
 4 files changed, 11 insertions(+), 251 deletions(-)
---