commit 7a66a24f3c2d36dd03986074a6c2f53a9a42e4a8 Merge: da5d54e... 593767a... Author: Douglas Silas <dhensley at redhat.com> Date: Wed Jun 9 14:32:33 2010 +0200 Merge branch 'master' into comm Conflicts: en-US/Book_Info.xml ---