[deployment-guide/comm-rel: 2/13] Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guid

[dsilas]

commit 4504037eab0eb3b3069f274b3df350e58b5221f5
Merge: 83e335d... acc1c0b...
Author: Martin Prpic <mprpic at redhat.com>
Date:   Fri Jun 11 13:05:30 2010 +0200

    Merge branch 'master' of git+ssh://git.engineering.redhat.com/srv/git/users/dhensley/Deployment_Guide
    
    Conflicts:
    	en-US/Book_Info.xml

 en-US/Book_Info.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---